Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

# Conflicts:
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java
#	ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/DataSyncTask.java

ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/AlarmPushController.java

@@ -131,6 +131,7 @@ public class AlarmPushController {
     private SisAlarmEventsBo convertToAlarmEvents(Map<String, Object> recordMap, Long recordId) {
         SisAlarmEventsBo sisAlarmEvents = new SisAlarmEventsBo();
         sisAlarmEvents.setId(recordId);
+
         // 转换类型和级别
 //        sisAlarmEvents.setType(convertToLong(recordMap.get("Type")));
         sisAlarmEvents.setBigType(EventBigTypeEnum.EQUIPMENT_UP.getCode());