From e631f307d90aadf6e20d40d0d30a5f29d4b0767f Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期一, 18 三月 2024 16:04:11 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java index b557c6b..fc2a538 100644 --- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java +++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java @@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dsh.activity.feignclient.other.model.TOperatorCity; import lombok.Data; +import java.util.List; import java.util.Map; @Data @@ -24,6 +26,9 @@ private Page<Map<String, Object>> page; private String cityCode; private Integer storeId; - - + private Integer operatorId; + private Integer objType; + private List<Integer> storeIds; + // 运营商使用 + private List<TOperatorCity> operatorCities; } -- Gitblit v1.7.1