From 9c003628737e4dae0773857f1960614f0754cd9a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 26 十月 2023 08:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index fced99b..d122000 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -242,6 +242,8 @@
mapList.add(map);
}
}
+ }else {
+ mapList = mapList1;
}
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
--
Gitblit v1.7.1