Skip to content

A
amos-boot-biz
Commit 2154cf0f authored by caotao's avatar caotao
Browse files
Options

解决代码冲突

parent d964368c
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ 2154cf0f
...@@ -102,4 +102,4 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator { ...@@ -102,4 +102,4 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
return monitorFanIndicatorregionMapper.getIndicatoralueAvage(gateway,indicator); return monitorFanIndicatorregionMapper.getIndicatoralueAvage(gateway,indicator);
} }
} }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment