Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldHistoryServiceImpl.java

@@ -118,7 +118,7 @@ public class MouldHistoryServiceImpl extends ServiceImpl<MouldHistoryMapper, Mou
             List<MouldHistoryTimeVO> mapValue = entry.getValue();
             vo.setMinCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).min().getAsInt());
             vo.setMinCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).max().getAsInt());
-            vo.setAvgCycle(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).average().getAsDouble());
+            vo.setAvgCycle(0.1*(mapValue.stream().mapToInt(MouldHistoryTimeVO::getTimeCost).sum()/(mapValue.size()-1)));
             resultList.add(vo);
         }
         System.out.println("原来的resultList===>"+resultList);