From 543e0a9c357e9354cd47eba36e8a2e6b9582ecd0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 14:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
index 26e2585..296a8dd 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -127,6 +127,7 @@
couponInfo.setShelfStatus(0);
List<String> goodsNameList = couponInfo.getGoodsNameList();
couponInfo.setGoodsNameJson(JSON.toJSONString(goodsNameList));
+ couponInfo.setShelfStatus(1);
couponInfoService.save(couponInfo);
return R.ok();
}
@@ -187,6 +188,7 @@
@GetMapping("/getReceiveRecord")
public R<IPage<UserCoupon>> getReceiveRecord(@ApiParam("页码") @RequestParam Integer pageNum, @ApiParam("大小") Integer pageSize,UserCoupon userCoupon) {
+ // TODO 待完善
return null;
}
--
Gitblit v1.7.1