合并代码

puzhibing

2024-03-05 794a2ec5fa219a0a87be0c72bd59602cb9f6c6dc

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

@@ -26,6 +26,6 @@

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

    Object changeState(CoachChangeStateVO dto);
    void changeState(CoachChangeStateVO dto);

}