From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
index 3815af6..11a35a9 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -77,7 +77,7 @@
* 修改活动
*/
@PostMapping("/update")
- @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理-订单优惠活动"})
+ @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理"})
public R<Void> updateActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
orderActivityInfo.setId(Long.valueOf(orderActivityInfo.getIdStr()));
orderActivityInfoService.updateById(orderActivityInfo);
@@ -115,7 +115,7 @@
if (StringUtils.isNotEmpty(vipIds)){
String[] vipIdArr = vipIds.split(",");
if (vipIdArr.length == 7){
- item.setVipIds("全部");
+ item.setVipName("全部");
}else {
List<String> vipNameList = new ArrayList<>();
for (String vipId : vipIdArr) {
--
Gitblit v1.7.1