From 51a13368cd66ffa48f37c8e2f0b8e3ba98f0e95c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 06 十一月 2024 10:50:11 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java |    3 +++
 ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java
index 268f830..8599583 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TShop.java
@@ -40,6 +40,9 @@
     @ApiModelProperty(value = "店铺负责人")
     @TableField("shopHead")
     private String shopHead;
+    @ApiModelProperty(value = "区域")
+    @TableField("area")
+    private String area;
 
     @ApiModelProperty(value = "店铺样式")
     @TableField("shopStyle")
diff --git a/ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml
index 4eee20e..f7ad8ba 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TShopMapper.xml
@@ -21,16 +21,17 @@
         <result column="updateBy" property="updateBy" />
         <result column="userId" property="userId" />
         <result column="mealType" property="mealType" />
+        <result column="area" property="area" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, shopType, shopName,shopHead, shopStyle, systemName, systemLogo, businessLicense,status,account,
-            createTime, updateTime, disabled, createBy, updateBy,userId,mealType
+            createTime, updateTime, disabled, createBy, updateBy,userId,mealType,area
     </sql>
     <select id="pageList" resultType="com.ruoyi.system.vo.TShopVO">
         select id, shopType, shopName,shopHead, shopStyle, systemName, systemLogo, businessLicense,
-        status,account, createTime, updateTime, disabled, createBy, updateBy,userId,mealType
+        status,account, createTime, updateTime, disabled, createBy, updateBy,userId,mealType,area
         from t_shop ts
         <where>
             <if test="query.shopType != null">

--
Gitblit v1.7.1