Merge remote-tracking branch 'origin/master' into master

@@ -147,7 +147,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
         sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
         sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
         List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
         List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
 
 
-        dataMap.put("totalCost",JSUtils.subtract(repairCost,maintainCost));
+        dataMap.put("totalCost",JSUtils.add(repairCost,maintainCost));
         dataMap.put("dataList",dataList);
         dataMap.put("dataList",dataList);
         return dataMap;
         return dataMap;
     }
     }