Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-11 6a8b55a2183720ff6106f581695298168896cadc

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

@@ -34,6 +34,18 @@

                                                      );

    List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name,
                                                      @Param("type")Integer type,
                                                      @Param("distributionMethod")Integer distributionMethod,
                                                      @Param("userPopulation")Integer userPopulation,
                                                      @Param("status")Integer status,
                                                      @Param("state")Integer state,
                                                      @Param("page")Page<Map<String, Object>> page,
                                                      @Param("cityCode") String cityCode,
                                                      @Param("storeId")Integer storeId

    );

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