Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-04 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5

 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