Merge remote-tracking branch 'origin/master'

nickchange

2023-11-14 a1d261d6c92c38d9e496e11d1bc224ecc1d34798

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

@@ -34,6 +34,8 @@

    List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch);

    List<Map<String, Object>> queryCouponListOfSearch1(CouponListOfSearch ofSearch);

    List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch);

    List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type);