From b17b0e4d165d3d5cc272bd796e0dc315847de1a9 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 12 二月 2025 15:58:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java index ee82745..25d3d3c 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java @@ -135,7 +135,7 @@ /** 椤圭洰涓氫富鍗曚綅 */ @ApiModelProperty("椤圭洰涓氫富鍗曚綅") - private String projectOwnerUnit; + private Long projectOwnerUnit; /** 椤圭洰鑱旂郴浜� */ @ApiModelProperty("椤圭洰鑱旂郴浜�") @@ -157,14 +157,20 @@ @ApiModelProperty("鐘舵�佺爜") private String projectColorCode; + @ApiModelProperty("璧嬬爜") + private String coding; + @ApiModelProperty("鏂囦欢") private List<File> fileList; - + private Integer usedStatus; + private String remark; + private Long processId; private ProjectInvestmentInfoVO projectInvestmentInfo; private ProjectInvestmentFundingVO projectInvestmentFunding; private ProjectUnitRegistrationInfoVO projectUnitRegistrationInfo; private ProjectInvestmentPolicyComplianceVO projectInvestmentPolicyCompliance; - + private Boolean auditRole; + private String projectOwnerUnitName; public static ProjectInfoVO getVoByEntity(@NonNull ProjectInfo entity, ProjectInfoVO vo) { if(vo == null) { vo = new ProjectInfoVO(); -- Gitblit v1.8.0