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" + @@ -18,8 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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