解决代码冲突

2154cf0f · caotao · d964368c · 2154cf0f
Commit 2154cf0f authored Jul 04, 2023 by caotao
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
@@ -102,4 +102,4 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
        return  monitorFanIndicatorregionMapper.getIndicatoralueAvage(gateway,indicator);
    }
 }
-}
+