From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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