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 | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 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 ac22ec2..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
@@ -1,7 +1,10 @@
package com.ruoyi.shop.domain.dto;
import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
/**
* @author jqs34
@@ -13,5 +16,89 @@
@Data
public class MgtShopPageDto extends MgtPageDto {
+ @ApiModelProperty(value = "商户类型1经销商2代理商")
+ private Integer shopType ;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword ;
+
+ @ApiModelProperty(value = "店铺地址省code")
+ private String shopProvinceCode;
+
+ @ApiModelProperty(value = "店铺地址市code")
+ private String shopCityCode;
+
+ @ApiModelProperty(value = "店铺地址区code")
+ private String shopAreaCode;
+
+ @ApiModelProperty(value = "签约开始时间")
+ private String signStartTime;
+
+ @ApiModelProperty(value = "签约结束时间")
+ private String signEndTime;
+
+ @ApiModelProperty(value = "签约省code")
+ private String signProvinceCode;
+
+ @ApiModelProperty(value = "签约市code")
+ private String signCityCode;
+
+ @ApiModelProperty(value = "签约区域code")
+ private String signAreaCode;
+
+ @ApiModelProperty(value = "商户状态0冻结1正常2终止合作")
+ private Integer shopStatus;
+
+ @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;
+
+ @ApiModelProperty(value = "店铺设置状态")
+ private String shopCustomStatus;
+
+ @ApiModelProperty(value = "到期标记")
+ private Integer expireFlag;
+
+ @ApiModelProperty(value = "商户标签 多个,隔开")
+ private String shopTags;
+
+ @ApiModelProperty(value = "扶持能力1.有2.没有")
+ private Integer supportingCapacityFlag;
+
+ @ApiModelProperty(value = "店面操作人数1.1人2.1人以上")
+ private Integer operationPersonFlag;
+
+ @ApiModelProperty(value = "执行力1.强2.弱")
+ private Integer executiveForceFlag;
+
+ @ApiModelProperty(value = "格局1.大2.小")
+ private Integer patternFlag;
+
+ @ApiModelProperty(value = "人脉1.宽2.窄")
+ private Integer connectionFlag;
+
+ @ApiModelProperty(value = "经济能力1.强2.差")
+ private Integer economicAbilityFlag;
+
+ @ApiModelProperty(value = "与合作商关系1.好2.差")
+ private Integer relationPartner;
+
+ @ApiModelProperty(value = "商铺id")
+ private Integer shopId;
+
+ @ApiModelProperty(value = "关联账户id，多个用逗号分隔")
+ private String associatedAccount;
}
--
Gitblit v1.7.1