From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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