Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java

@@ -31,8 +31,8 @@
                                                      @Param("page")Page<Map<String, Object>> page,
                                                      @Param("cityCode") String cityCode,
                                                      @Param("storeId")Integer storeId,
                                                      @Param("objType")Integer objType
                                                      );
                                                      @Param("operatorId")Integer operatorId,
                                                      @Param("objType")Integer objType);

    List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name,
                                                      @Param("type")Integer type,