From f1f0295906e3dc7d07d97d264334e5eb6642adfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?= Date: Fri, 13 Mar 2026 14:53:25 +0000 Subject: [PATCH] Merge #63 into master from cc_20260313_standard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat：新增筛选 * cc_20260313_standard: (1 commits squashed) - feat：新增筛选 Signed-off-by: 正新 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/63 --- .../src/main/resources/mapper/ShopInfoMapper.xml | 3 +++ .../main/java/com/cool/store/request/BranchShopRequest.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 580624a18..bb1dac26e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -345,6 +345,9 @@ and a.investment_manager = #{request.investmentManagerUserId} + + and a.use_standard_store = #{request.useStandardStore} + and DATE_ADD(a.create_time, INTERVAL 50 DAY) >= #{request.openTimeStart} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java index 4be0fbb0f..f32fd14e0 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java @@ -44,6 +44,9 @@ public class BranchShopRequest extends PageBasicInfo{ @NotNull private Integer flag; + @ApiModelProperty("使用标准店型") + private Integer useStandardStore; + @ApiModelProperty("合同开始时间") private Date contractStartTime; @ApiModelProperty("合同结束时间")