Merge remote-tracking branch 'origin/dev-0' into dev-0

# Conflicts:
#	services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/common/SeMonitorThreshold.java
#	services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/SeAlarmServiceImpl.java

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgSeMonitorCurrent.java

@@ -36,4 +36,4 @@ public class FhzgSeMonitorCurrent implements Serializable {
     private Long alarmEventId;
     private LocalDateTime createTime;
     private LocalDateTime updateTime;
-}
+}

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/FhzgSeMonitorVoltage.java

@@ -42,4 +42,4 @@ public class FhzgSeMonitorVoltage implements Serializable {
     private Long alarmEventId;
     private LocalDateTime createTime;
     private LocalDateTime updateTime;
-}
+}

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/entity/vo/StaticGridDashboardVO.java

@@ -185,4 +185,4 @@ public class StaticGridDashboardVO implements Serializable {
         @ApiModelProperty(value = "关联设备ID列表")
         private List<String> deviceIds;
     }
-}
+}

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/SeIndicatorServiceImpl.java

@@ -531,4 +531,4 @@ public class SeIndicatorServiceImpl implements SeIndicatorService {
     private int safeInt(Integer v) {
         return v == null ? 0 : v;
     }
-}
+}

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/SeSnapshotServiceImpl.java

@@ -655,4 +655,4 @@ public class SeSnapshotServiceImpl implements SeSnapshotService {
         // 重新走正常流程写入（此时防重逻辑不会跳过任何记录）
         processSnapshot(snapshotJson);
     }
-}
+}