Merge remote-tracking branch 'origin/master'

liujie

2023-08-09 b38caa7012b8da89d5ca61d389258d4fd8d9172e

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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.activity.entity.Coupon;
import com.dsh.activity.feignclient.model.CouponExamineListSearch;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.model.CouponListVo;

import java.util.List;
@@ -26,4 +28,9 @@


    Map<String, Object> queryConponRuleOfJson(Integer id);

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

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

}