si-sql修复

services/load-transfer-si/src/main/resources/mapper/DistMappingFileMapper.xml

@@ -62,7 +62,7 @@
     </delete>
 
     <select id="getDeviceInfoById" resultType="com.hdkj.lt.modle.vo.svg.FeederBaseVO">
-        select f.psr_id, f.name, ifnull(s.dict_label,f.city) city, ifnull(s.,f.city_name) city_name
+        select f.psr_id, f.name, ifnull(s.dict_label,f.city) city, ifnull(s.dict_label,f.city_name) city_name
         from dwd_shb_ds_feeder_base f
         inner join (select a.feeder, a.feeder_name from t_feeder_topo a
             join t_feeder_topo b on a.psr_id=b.psr_id where b.normal_open='true' and b.feeder=#{feederId}