Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 c69e75c9e3560c0a158b2d1bb3a62e5cbc7ed320

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