Merge remote-tracking branch 'origin/master'

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -710,7 +710,7 @@
     FROM
     bus_jcb_glkg a
     LEFT JOIN base_station s ON a.station_id = s.station_id
-    LEFT JOIN sys_dict_datadict ON (a.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (a.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       a.del_flag = '0'
       AND s.del_flag = '0'