禅道bug修复完毕，准备部署正式

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EquipmentServiceImpl.java

@@ -254,10 +254,22 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		if (count > 0) {
 			return BaseResponse.errorMsg(query.getName() + "已存在");
 		}
-		Equipment equipment = new Equipment();
-		BeanUtils.copyProperties(query, equipment);
-		equipmentMapper.updateById(equipment);
-		return BaseResponse.okData(equipment);
+		Equipment equipmentOld = equipmentMapper.selectById(query.getId());
+		equipmentOld.setType(query.getType())
+				.setName(query.getName())
+				.setCode(query.getCode())
+				.setBrand(query.getBrand())
+				.setModel(query.getModel())
+				.setPosition(query.getPosition())
+				.setPurchaseDate(query.getPurchaseDate())
+				.setAssetsCode(query.getAssetsCode())
+				.setAssetsValue(query.getAssetsValue())
+				.setTestCycle(query.getTestCycle())
+				.setRemark(query.getRemark());
+
+//		BeanUtils.copyProperties(query, equipmentOld);
+		equipmentMapper.updateById(equipmentOld);
+		return BaseResponse.okData(equipmentOld);
 	}
 
 	/**

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -159,8 +159,6 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 				headers[3] = "起止时间";
 				headers[4] = "上报工日";
 				headers[5] = "状态";
-				headers[6] = "工作类别";
-				headers[7] = "工作描述";
 
 				List<Object[]> datas = new ArrayList<>(list.size());
 				for (Map<String, Object> m : list) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java

@@ -166,7 +166,6 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
 			headers[5] = "审批工日";
 			headers[6] = "状态";
 			headers[7] = "最终产值";
-			headers[8] = "驳回意见";
 
 			List<Object[]> datas = new ArrayList<>(list.size());
 			for (Map<String, Object> m : list) {