From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +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 | 103 +++++++++++++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 37 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 3dd74c0..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
@@ -19,118 +19,147 @@
@ApiModelProperty(value = "商户id")
private Long shopId;
- @ApiModelProperty("商户名称")
+ @ApiModelProperty(value="商户编号")
+ private String shopNumber;
+
+ @ApiModelProperty(value="商户名称")
private String shopName;
- @ApiModelProperty("商户类型1.经销商2.代理商")
+ @ApiModelProperty(value="商户类型1.经销商2.代理商")
private Integer shopType;
- @ApiModelProperty("营业开始时间")
+ @ApiModelProperty(value="营业开始时间")
private String businessStartTime;
- @ApiModelProperty("营业结束时间")
+ @ApiModelProperty(value="营业结束时间")
private String businessEndTime;
- @ApiModelProperty("店主姓名")
+ @ApiModelProperty(value="店主姓名")
private String shopownerName;
- @ApiModelProperty("店主联系方式")
+ @ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
- @ApiModelProperty("签约区域")
+ @ApiModelProperty(value="签约省区域")
+ private String signProvinceCode;
+
+ @ApiModelProperty(value="签约市区域")
+ private String signCityCode;
+
+ @ApiModelProperty(value="签约区域")
private String signAreaCode;
- @ApiModelProperty("商户服务电话")
+ @ApiModelProperty(value="签约区域全称")
+ private String signAreaName;
+
+ @ApiModelProperty(value="商户服务电话")
private String shopServicePhone;
- @ApiModelProperty("管辖员工")
+ @ApiModelProperty(value="管辖员工")
private Long belongUserId;
- @ApiModelProperty("所属经销商")
+ @ApiModelProperty(value="管辖员工")
+ private String belongUserName;
+
+ @ApiModelProperty(value="所属经销商")
private Long belongShopId;
- @ApiModelProperty("扶持能力1.有2.没有")
+ @ApiModelProperty(value="所属经销商")
+ private String belongShopName;
+
+ @ApiModelProperty(value="扶持能力1.有2.没有")
private Integer supportingCapacityFlag;
- @ApiModelProperty("店面操作人数1.1人2.1人以上")
+ @ApiModelProperty(value="店面操作人数1.1人2.1人以上")
private Integer operationPersonFlag;
- @ApiModelProperty("执行力1.强2.弱")
+ @ApiModelProperty(value="执行力1.强2.弱")
private Integer executiveForceFlag;
- @ApiModelProperty("格局1.大2.小")
+ @ApiModelProperty(value="格局1.大2.小")
private Integer patternFlag;
- @ApiModelProperty("人脉1.宽2.窄")
+ @ApiModelProperty(value="人脉1.宽2.窄")
private Integer connectionFlag;
- @ApiModelProperty("经济能力1.强2.差")
+ @ApiModelProperty(value="经济能力1.强2.差")
private Integer economicAbilityFlag;
- @ApiModelProperty("与合作商关系1.好2.差")
+ @ApiModelProperty(value="与合作商关系1.好2.差")
private Integer relationPartner;
- @ApiModelProperty("曾从事事业")
+ @ApiModelProperty(value="曾从事事业")
private String businessHistory;
- @ApiModelProperty("店铺地址省code")
+ @ApiModelProperty(value="店铺地址省code")
private String shopProvinceCode;
- @ApiModelProperty("店铺地址市code")
+ @ApiModelProperty(value="店铺地址市code")
private String shopCityCode;
- @ApiModelProperty("店铺地址区code")
+ @ApiModelProperty(value="店铺地址区code")
private String shopAreaCode;
- @ApiModelProperty("店铺区域全称")
+ @ApiModelProperty(value="店铺区域全称")
private String shopAreaName;
- @ApiModelProperty("店铺详细地址")
+ @ApiModelProperty(value="店铺详细地址")
private String shopAddress;
- @ApiModelProperty("店铺经度")
+ @ApiModelProperty(value="店铺经度")
private String shopLongitude;
- @ApiModelProperty("店铺维度")
+ @ApiModelProperty(value="店铺维度")
private String shopLatitude;
- @ApiModelProperty("店铺详情")
+ @ApiModelProperty(value="店铺详情")
private String shopDetail;
- @ApiModelProperty("营销功能1开2关")
+ @ApiModelProperty(value="营销功能1开2关")
private Integer marketingFunctionFlag;
- @ApiModelProperty("领券1开2关")
+ @ApiModelProperty(value="领券1开2关")
private Integer platformCouponFlag;
- @ApiModelProperty("生日卡1开2关")
+ @ApiModelProperty(value="生日卡1开2关")
private Integer platformBirthdayFlag;
- @ApiModelProperty("推荐人")
+ @ApiModelProperty(value="抽奖1开2关")
+ private Integer lotteryDrawFlag;
+
+ @ApiModelProperty(value="推荐人")
private String recommendPerson;
- @ApiModelProperty("商户标签id 多个用,隔开")
+ @ApiModelProperty(value="商户标签id 多个用,隔开")
private String shopTagIds;
- @ApiModelProperty("商户标签")
+ @ApiModelProperty(value="商户标签")
private String shopTags;
- @ApiModelProperty("关联用户id 多个用,隔开")
+
+ @ApiModelProperty(value="关联用户id 多个用,隔开")
private String relUserIds;
- @ApiModelProperty("关联用户")
+ @ApiModelProperty(value="默认登录账号-开启的用户id集合")
+ private String relUserOpenIds;
+
+ @ApiModelProperty(value="关联用户")
private String relUsers;
- @ApiModelProperty("商户封面")
+ @ApiModelProperty(value="商户封面")
private String shopPicture;
- @ApiModelProperty("商户banner 多个用,隔开")
+ @ApiModelProperty(value="商户banner 多个用,隔开")
private String shopBanners;
- @ApiModelProperty("证书list")
+ @ApiModelProperty(value="证书list")
private List<ShopCertificate> shopCertificateList;
+ @ApiModelProperty(value="小鹅通讲师id 多个用,隔开")
+ private String xiaoeUserId;
+ @ApiModelProperty("修改价格权限（0=关，1=开）")
+ private Integer modifyPricePermission;
--
Gitblit v1.7.1