Merge remote-tracking branch 'origin/master'

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

@@ -475,9 +475,10 @@
     SELECT
     t.id,
     t.fdfxjyq_id,
+    b.dept_station_id station_id,
     v.station_name,
-    t.pillar_code,
-    t.fdh,
+    b.pillar_code,
+    b.dch fdh,
     t.temperature,
     t.check_date,
     t.pic_url,
@@ -534,9 +535,10 @@
     SELECT
     t.id,
     t.fdfxjyq_id,
+    b.dept_station_id station_id,
     v.station_name,
-    t.pillar_code,
-    t.fdh,
+    b.pillar_code,
+    b.dch fdh,
     t.temperature,
     t.check_date,
     t.pic_url,