From c642ca1d5aad271b22155fce6bd553533343501c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 24 七月 2025 09:10:10 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java
index c1cba5f..5bc946a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java
@@ -40,8 +40,17 @@
@ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
+ @ApiModelProperty(value="签约省区域")
+ private String signProvinceCode;
+
+ @ApiModelProperty(value="签约市区域")
+ private String signCityCode;
+
@ApiModelProperty(value="签约区域")
private String signAreaCode;
+
+ @ApiModelProperty(value="签约区域全称")
+ private String signAreaName;
@ApiModelProperty(value="商户服务电话")
private String shopServicePhone;
@@ -49,8 +58,14 @@
@ApiModelProperty(value="管辖员工")
private Long belongUserId;
+ @ApiModelProperty(value="管辖员工")
+ private String belongUserName;
+
@ApiModelProperty(value="所属经销商")
private Long belongShopId;
+
+ @ApiModelProperty(value="所属经销商")
+ private String belongShopName;
@ApiModelProperty(value="扶持能力1.有2.没有")
private Integer supportingCapacityFlag;
@@ -109,6 +124,9 @@
@ApiModelProperty(value="生日卡1开2关")
private Integer platformBirthdayFlag;
+ @ApiModelProperty(value="抽奖1开2关")
+ private Integer lotteryDrawFlag;
+
@ApiModelProperty(value="推荐人")
private String recommendPerson;
@@ -118,8 +136,12 @@
@ApiModelProperty(value="商户标签")
private String shopTags;
+
@ApiModelProperty(value="关联用户id 多个用,隔开")
private String relUserIds;
+
+ @ApiModelProperty(value="默认登录账号-开启的用户id集合")
+ private String relUserOpenIds;
@ApiModelProperty(value="关联用户")
private String relUsers;
@@ -133,7 +155,11 @@
@ApiModelProperty(value="证书list")
private List<ShopCertificate> shopCertificateList;
+ @ApiModelProperty(value="小鹅通讲师id 多个用,隔开")
+ private String xiaoeUserId;
+ @ApiModelProperty("修改价格权限（0=关，1=开）")
+ private Integer modifyPricePermission;
--
Gitblit v1.7.1