From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
index f5685ce..7e728d0 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/shop/Shop.java
@@ -296,23 +296,29 @@
*/
@TableField("shop_code")
private String shopCode;
-
+
/**
* 小鹅通讲师id
*/
@TableField("xiaoe_user_id")
private String xiaoeUserId;
-
+
/**
* 预约状态（0=关，1=开）
*/
@TableField("subscribe")
private Integer subscribe;
-
+ /**
+ * 修改价格权限（0=关，1=开）
+ */
+ @TableField("modify_price_permission")
+ private Integer modifyPricePermission;
+
+
@Override
protected Serializable pkVal() {
return this.shopId;
}
-
+
}
--
Gitblit v1.7.1