From 1cd453efd2f84dc15f964504c179c46f57267e90 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期五, 10 三月 2023 09:50:31 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml index 3687103..146a602 100644 --- a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml +++ b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml @@ -28,12 +28,11 @@ t1.latitude, t1.longitude, t1.`port`, - t1.belong_area belongArea, + t1.belong_area, t1.front_end_type frontEndType, t1.in_out_city_type inOutCityType, t2.`name` as frontEndTypeName, - t3.`name` as inOutCityTypeName, - t4.region_name as belongArea + t3.`name` as inOutCityTypeName FROM `ums_equipment_bayonet` t1 LEFT JOIN -- Gitblit v1.8.0