Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java

@@ -27,6 +27,6 @@ public class CommonPageUserFormDTO implements Serializable {
 
     private Integer pageSize = 10;
 
-    @NotBlank(message = "获取不到用户Id" , groups = PageUserGroup.class)
+    @NotBlank(message = "获取不到客户Id" , groups = PageUserGroup.class)
     private String customerId;
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -458,6 +458,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		ProjectStaffDTO projectStaffDTO = projectStaffService.getProjectStaffInfo(fromDTO.getProjectProcessId());
 		ProjectStaffEntity projectStaff = ConvertUtils.sourceToTarget(projectStaffDTO, ProjectStaffEntity.class);
 		projectStaff.setId(null);
+		//防止将被退回的项目相关人员节点的创建时间赋值给新增的相关人员节点的创建时间，否则数据统计将出现误差
+		projectStaff.setCreatedTime(null);
+		projectStaff.setUpdatedTime(null);
 		projectStaff.setProcessId(projectProcessEntity.getId());
 		projectStaff.setIsHandle(ProjectConstant.UNHANDLED);
 		projectStaffService.insert(projectStaff);