From c69e75c9e3560c0a158b2d1bb3a62e5cbc7ed320 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 16:53:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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