From f975b6d0832b447654aaf2372ce72f71ebb7f095 Mon Sep 17 00:00:00 2001
From: chenye <chenye0811@qq.com>
Date: 星期二, 11 七月 2023 11:11:55 +0800
Subject: [PATCH] 1

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
index fd0324a..e6ab8b7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java
@@ -1,11 +1,10 @@
 package com.ruoyi.shop.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.system.api.domain.dto.MgtPageDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * @author jqs34
@@ -32,8 +31,11 @@
     @ApiModelProperty(value = "店铺地址区code")
     private String shopAreaCode;
 
-    @ApiModelProperty(value = "签约时间")
-    private Date signTime;
+    @ApiModelProperty(value = "签约开始时间")
+    private String signStartTime;
+
+    @ApiModelProperty(value = "签约结束时间")
+    private String signEndTime;
 
     @ApiModelProperty(value = "签约省code")
     private String signProvinceCode;
@@ -53,6 +55,9 @@
     @ApiModelProperty(value = "归属员工")
     private Long belongUserId;
 
+    @ApiModelProperty(value = "归属经销商id")
+    private Long belongShopId;
+
     @ApiModelProperty(value = "来源渠道")
     private String shopSource;
 
@@ -62,7 +67,7 @@
     @ApiModelProperty(value = "到期标记")
     private Integer expireFlag;
 
-    @ApiModelProperty(value = "商户标签")
+    @ApiModelProperty(value = "商户标签 多个,隔开")
     private String shopTags;
 
     @ApiModelProperty(value = "扶持能力1.有2.没有")
@@ -86,6 +91,9 @@
     @ApiModelProperty(value = "与合作商关系1.好2.差")
     private Integer relationPartner;
 
+    @ApiModelProperty(value = "商铺id")
+    private Integer shopId;
 
-
+    @ApiModelProperty(value = "多个用户的id")
+    private List<Long> ids;
 }

--
Gitblit v1.7.1