解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -538,8 +538,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String,Object> map2 = new HashMap<>();
         map1.put("data", values);
         map2.put("data", valueList);
-        seriesData.add(map1);
         seriesData.add(map2);
+        seriesData.add(map1);
         map.put("seriesData", seriesData);
         map.put("axisData",time);