From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 三月 2024 10:11:21 +0800 Subject: [PATCH] 合并代码 --- cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/CouponListOfSearch.java | 3 +++ 1 files changed, 3 insertions(+), 0 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 48a53d0..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,6 +2,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dsh.activity.feignclient.other.model.TOperatorCity; import lombok.Data; import java.util.List; @@ -28,4 +29,6 @@ private Integer operatorId; private Integer objType; private List<Integer> storeIds; + // 运营商使用 + private List<TOperatorCity> operatorCities; } -- Gitblit v1.7.1