Merge remote-tracking branch 'origin/master'

2023-05-29 13:36:59 +08:00
parent 4a8e540f61 9dbced164e
commit c11f60bb06
7 changed files with 30 additions and 32 deletions
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeptLineMapper.xml
@@ -27,7 +27,8 @@
            lineDetail.Time_Interval as `interval`,
            dic.value voltageLevel,
            dev.id devId,
-            device.com_flag comFlag
+            device.com_flag comFlag,
+            1 as lineType
        </if>
        <!--母线-->
        <if test="type == 2">