From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopPageDto.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 4d77ad7..2729107 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
@@ -4,7 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -31,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;
@@ -49,9 +52,16 @@
@ApiModelProperty(value = "推荐人")
private String recommendPerson;
+ @ApiModelProperty(value = "部门id")
+ private Long deptId;
+
@ApiModelProperty(value = "归属员工")
private Long belongUserId;
+ @ApiModelProperty(value = "归属经销商id")
+ private Long belongShopId;
+ @ApiModelProperty(value = "归属员工ids")
+ private List<Long> belongUserIds;
@ApiModelProperty(value = "来源渠道")
private String shopSource;
@@ -85,6 +95,10 @@
@ApiModelProperty(value = "与合作商关系1.好2.差")
private Integer relationPartner;
-
+ @ApiModelProperty(value = "商铺id")
+ private Integer shopId;
+
+ @ApiModelProperty(value = "关联账户id，多个用逗号分隔")
+ private String associatedAccount;
}
--
Gitblit v1.7.1