From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
index 807d879..94dde71 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -90,7 +90,7 @@
public R<MerVerifyAwardVo> sureVerifyPrize(@RequestBody MerVerifyPrizeDto merVerifyPrizeDto) {
Long userId = SecurityUtils.getUserId();
merVerifyPrizeDto.setUserId(userId);
- MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo();
+ MerVerifyAwardVo merVerifyAwardVo = orderService.sureVerifyPrize(merVerifyPrizeDto);
return R.ok(merVerifyAwardVo);
}
--
Gitblit v1.7.1