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/vo/MgtShopInfoVo.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 8bf91bf..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
@@ -124,6 +124,9 @@
@ApiModelProperty(value="生日卡1开2关")
private Integer platformBirthdayFlag;
+ @ApiModelProperty(value="抽奖1开2关")
+ private Integer lotteryDrawFlag;
+
@ApiModelProperty(value="推荐人")
private String recommendPerson;
@@ -136,6 +139,9 @@
@ApiModelProperty(value="关联用户id 多个用,隔开")
private String relUserIds;
+
+ @ApiModelProperty(value="默认登录账号-开启的用户id集合")
+ private String relUserOpenIds;
@ApiModelProperty(value="关联用户")
private String relUsers;
@@ -152,7 +158,8 @@
@ApiModelProperty(value="小鹅通讲师id 多个用,隔开")
private String xiaoeUserId;
-
+ @ApiModelProperty("修改价格权限（0=关，1=开）")
+ private Integer modifyPricePermission;
--
Gitblit v1.7.1