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/MgtEditShopDto.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java
index 16d2f10..6625971 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java
@@ -45,16 +45,16 @@
@ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
- @ApiModelProperty(value="签约省区域")
+ @ApiModelProperty(value="签约省区域（多个以分号相隔）")
private String signProvinceCode;
- @ApiModelProperty(value="签约市区域")
+ @ApiModelProperty(value="签约市区域（多个以分号相隔）")
private String signCityCode;
- @ApiModelProperty(value="签约区域")
+ @ApiModelProperty(value="签约区域（多个以分号相隔）")
private String signAreaCode;
- @ApiModelProperty(value="签约区域全称")
+ @ApiModelProperty(value="签约区域全称（多个以分号相隔）")
private String signAreaName;
@ApiModelProperty(value="商户服务电话")
@@ -123,18 +123,33 @@
@ApiModelProperty(value="生日卡1开2关")
private Integer platformBirthdayFlag;
+ @ApiModelProperty(value="抽奖1开2关")
+ private Integer lotteryDrawFlag;
+
+
@ApiModelProperty(value="推荐人")
private String recommendPerson;
@ApiModelProperty(value="商户标签id 多个用,隔开")
private String shopTagIds;
+
@ApiModelProperty(value="关联用户id 多个用,隔开")
private String relUserIds;
+
+ @ApiModelProperty(value="默认登录账号-开启的用户id集合")
+ private String relUserOpenIds;
+
@ApiModelProperty(value="商户封面")
private String shopPicture;
@ApiModelProperty(value="商户banner 多个用,隔开")
private String shopBanners;
+
+ @ApiModelProperty(value="小鹅通讲师id 多个用,隔开")
+ private String xiaoeUserId;
+
+ @ApiModelProperty("修改价格权限（0=关，1=开）")
+ private Integer modifyPricePermission;
}
--
Gitblit v1.7.1