From 64264bb278bbfaa8df29f5f19a59d4e8345b04aa Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 七月 2025 09:59:41 +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 |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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..db4e83d 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
@@ -309,6 +309,18 @@
     @TableField("subscribe")
     private Integer subscribe;
     
+    /**
+     * 修改价格权限(0=关,1=开)
+     */
+    @TableField("modify_price_permission")
+    private Integer modifyPricePermission;
+    
+    /**
+     * 抖音门店id
+     */
+    @TableField("poi_id")
+    private String poiId;
+    
     
     @Override
     protected Serializable pkVal() {

--
Gitblit v1.7.1