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

44323

2023-10-24 0379c65f03ec6ccf27eebbdc72a25cabbda28e5a

 cloud-server-activity/src/main/java/com/dsh/activity/service/PointsMerchandiseService.java

@@ -22,6 +22,8 @@

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

    List<Map<String, Object>> queryGoodsListOfSearchAudit(IntegralGoodsOfSearch ofSearch);

    List<Map<String, Object>> ticketList(IntegralGoodsOfSearch ofSearch);

    Object changeState(CoachChangeStateVO dto);