Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmProject.java

@@ -64,9 +64,15 @@ public class BmProject extends BaseEntity
     private String impUnitName;
 
     @ApiModelProperty(value = "项目部")
-    @Excel(name = "项目部", width = 25)
+    //@Excel(name = "项目部", width = 25)
     private String departName;
 
+
+    @ApiModelProperty(value = "所属项目中心")
+    @Excel(name = "项目中心", width = 25)
+    @Size(max=60, message = "所属项目中心长度不能超过60")
+    private String proCenter;
+
     @ApiModelProperty(value = "工程类型")
     @Excel(name = "工程类型")
     private String proType;
@@ -76,6 +82,8 @@ public class BmProject extends BaseEntity
     @Size(max=60, message = "工程编号长度不能超过60")
     private String proCode;
 
+
+
     /**
      * 是否匹配i8工程
      */
@@ -145,9 +153,7 @@ public class BmProject extends BaseEntity
     @ApiModelProperty(value = "工程性质名称")
     private String proNatureName;
 
-    @ApiModelProperty(value = "所属项目中心")
-    @Size(max=60, message = "所属项目中心长度不能超过60")
-    private String proCenter;
+
 
     @ApiModelProperty(value = "往来单位id")
     private Long unitId;