From dc64b1b099a45dab5798ad4f963f54bc522339dd Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 23 Jun 2025 17:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/canteen/core/kitchen/domain/KitchenSubPlace.java   | 2 ++
 .../main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
index 014712c..340a91c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
@@ -40,6 +40,8 @@ public class KitchenSubPlace extends BaseEntity {
 
     private String canteenName;
 
+    private Long areaId;
+
     private String areaName;
 
     /** 仓库id */
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
index dee5413..cd9146a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="imgUrl"    column="img_url"    />
         <result property="canteenId"    column="canteen_id"    />
         <result property="canteenName"    column="canteen_name"    />
+        <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="createBy"    column="create_by"    />
@@ -18,8 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKitchenSubPlaceVo">
-        select ksp.sub_place_id, ksp.sub_place_name, ksp.img_url, ksp.canteen_id, ksp.warehouse_id,
-               ksp.create_by, ksp.create_time, ksp.update_by, ksp.update_time, bc.canteen_name, ba.area_name
+        select ksp.sub_place_id, ksp.sub_place_name, ksp.img_url, ksp.canteen_id, ksp.warehouse_id, ksp.create_by,
+               ksp.create_time, ksp.update_by, ksp.update_time, bc.canteen_name, ba.area_name, ba.area_id
         from kitchen_sub_place ksp
         left join basic_canteen bc on bc.canteen_id = ksp.canteen_id
         left join basic_area ba on ba.area_id = bc.area_id