Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 7042adfac9eb4fcdb6cae5c9471727cdaeb358b5

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