From c897a68da55d63439826d37be3cb13c5c0f95a48 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 25 七月 2025 20:13:02 +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 |   18 ++++++++++++++++++
 1 files changed, 18 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..a1d674c 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,7 +309,25 @@
     @TableField("subscribe")
     private Integer subscribe;
     
+    /**
+     * 修改价格权限(0=关,1=开)
+     */
+    @TableField("modify_price_permission")
+    private Integer modifyPricePermission;
     
+    /**
+     * 抖音门店id
+     */
+    @TableField("dy_poi_id")
+    private String dyPoiId;
+
+    /**
+     * 快手门店id
+     */
+    @TableField("ks_poi_id")
+    private String ksPoiId;
+
+
     @Override
     protected Serializable pkVal() {
         return this.shopId;

--
Gitblit v1.7.1