From ceb8e9adae1835a3f8595e71eeb18b5e8f5dd5b9 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 28 九月 2024 20:40:50 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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..b4fb97d 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
@@ -44,8 +43,9 @@
ums_sccg_region t4 on t4.id=t1.belong_area
<where>
<if test="bayonetName !=null and bayonetName !='' ">
- name like CONCAT('%',#{bayonetName},'%')
+ t1.name like CONCAT('%',#{bayonetName},'%')
</if>
</where>
+ order by t1.id desc
</select>
</mapper>
--
Gitblit v1.8.0