Merge remote-tracking branch 'origin/master'

This commit is contained in:
hongchao 2026-01-28 17:05:40 +08:00
commit dfdb673754
1 changed files with 10 additions and 4 deletions

View File

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