From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
index 0ef60f5..724569d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerCouponController.java
@@ -72,16 +72,16 @@
}
@RequestMapping(value = "/getMerCouponVo", method = RequestMethod.POST)
- @ApiOperation(value = "商户获取优惠券编辑信息")
+ @ApiOperation(value = "商户获取优惠券编辑信息【2.0】")
public R<MerCouponGetVo> getMerCouponVo(@RequestBody MerBaseGetDto merBaseGetDto) {
Long userId = SecurityUtils.getUserId();
merBaseGetDto.setUserId(userId);
MerCouponGetVo couponGetVo = couponService.getMerCouponVo(merBaseGetDto);
return R.ok(couponGetVo);
}
-
+
@RequestMapping(value = "/editMerCoupon", method = RequestMethod.POST)
- @ApiOperation(value = "商户编辑优惠券")
+ @ApiOperation(value = "商户编辑优惠券【2.0】")
public R editMerCoupon(@RequestBody MerCouponEditDto merCouponEditDto) {
Long userId = SecurityUtils.getUserId();
merCouponEditDto.setUserId(userId);
--
Gitblit v1.7.1