Merge remote-tracking branch 'origin/master'

liujie

2023-09-23 852681bc9257e9eaae64d027a9bc6d88f93f35b4

 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;