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

puzhibing

2023-11-28 424dbec2615a0e80217c4b363eed33ddd04adb48

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

@@ -22,8 +22,10 @@

    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);
    void changeState(CoachChangeStateVO dto);

}