Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -6,7 +6,9 @@
import com.dsh.activity.feignclient.model.CouponExamineListSearch;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.IntegralGoodsOfSearch;

import java.util.Collection;
import java.util.List;
import java.util.Map;

@@ -32,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);