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

puzhibing

2023-12-04 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc

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

@@ -20,8 +20,12 @@

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

    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);

}