From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 eceb9b3..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
@@ -22,5 +24,11 @@
private Integer state;
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