From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +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 | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 8857783..4c5ba67 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,8 +45,17 @@
@ApiModelProperty(value="店主联系方式")
private String shopownerPhone;
- @ApiModelProperty(value="签约区域")
+ @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;
@@ -120,12 +129,20 @@
@ApiModelProperty(value="商户标签id 多个用,隔开")
private String shopTagIds;
+
@ApiModelProperty(value="关联用户id 多个用,隔开")
private String relUserIds;
+
@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