Merge remote-tracking branch 'origin/master'

liujie

2023-09-28 41c07e4558ed3a1cbdda0711f78cd3a812c06829

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

@@ -25,5 +25,16 @@
                                                     @Param("activeStatus") Integer activeStatus,
                                                     @Param("state") Integer state,
                                                     @Param("page") Page<Map<String, Object>> page);
    List<Map<String, Object>> queryGoodsListOfSearchAudit(@Param("name")String name,
                                                     @Param("type")Integer type,
                                                     @Param("redemptionMethod")Integer redemptionMethod,
                                                     @Param("userPopulation") Integer userPopulation,
                                                     @Param("activeStatus") Integer activeStatus,
                                                     @Param("state") Integer state,
                                                     @Param("page") Page<Map<String, Object>> page);


    void saveCity(@Param("id") Integer id, @Param("province") String province, @Param("provinceCode") String provinceCode, @Param("city") String city, @Param("cityCode") String cityCode);


}