Merge remote-tracking branch 'origin/main'

2026-01-26 15:04:32 +08:00
parent 5389903ed7 0684bdf503
commit 8ccdb84ea9
8 changed files with 388 additions and 55 deletions
--- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml
@@ -571,7 +571,8 @@
        detail.obj_id,
        detail.big_obj_type,
        detail.small_obj_type,
-        detail.Power_Flag powerFlag
+        detail.Power_Flag powerFlag,
+        detail.Power_Substation_Name powerSubstationName
        FROM
        pq_line line,
        pq_line_detail detail,