解决冲突

35b7cefb · tangwei · ff942e66 · 9d229f51 · 35b7cefb
Commit 35b7cefb authored Sep 20, 2023 by tangwei
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

MonitorFanIndicatorImpl.java ...odule/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java +1 -1

No files found.
--- a/amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
+++ b/amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
@@ -627,7 +627,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
        }
        alarmEventService.saveBatch(newAlarmEvents);

-    },
+    }


    public void timingTemporarysSorageData(String gatewayId, long timeInMillis) {