解决冲突

5 years ago · a1c3b79edb
1 changed files with 0 additions and 5 deletions
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/ProjectOrgRelationDTO.java
@ -115,9 +115,4 @@ public class ProjectOrgRelationDTO implements Serializable {
     */
 	private String updatedBy;

-    /**
-     * 客户ID
-     */
-    private String customerId;
-
 }