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

44323

2023-10-07 78a4df6ad36a5cdf18d40ef539e0ce9609c71b4f

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

@@ -20,6 +20,8 @@

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

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

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

    Object changeState(CoachChangeStateVO dto);