Merge remote-tracking branch 'origin/master'

liujie

2023-09-23 852681bc9257e9eaae64d027a9bc6d88f93f35b4

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

@@ -26,5 +26,4 @@
                                                     @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);
}