From 3452c0838a2a1672c2e56cfea81867addd499988 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 23:46:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
index 20f31b2..420a280 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectEngineeringVO.java
@@ -1,8 +1,11 @@
package com.ycl.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.base.AbsUUIDVo;
import com.ycl.system.domain.base.AbsVo;
import com.ycl.domain.entity.ProjectEngineering;
+
+import java.util.ArrayList;
import java.util.List;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
@@ -44,6 +47,27 @@
@ApiModelProperty("鐘舵��")
private String status;
+
+ @ApiModelProperty("涓荤閮ㄩ棬")
+ private Long department;
+
+ @ApiModelProperty("涓氫富鍗曚綅")
+ private Long unit;
+
+ @ApiModelProperty("骞翠唤")
+ private Date year;
+
+ @ApiModelProperty("鐖跺伐绋�")
+ private String parent;
+
+ private String departmentName;
+
+ private String unitName;
+
+
+ @ApiModelProperty("宸ョ▼鍒楄〃")
+ private List<ProjectEngineeringVO> children = new ArrayList<ProjectEngineeringVO>();
+
public static ProjectEngineeringVO getVoByEntity(@NonNull ProjectEngineering entity, ProjectEngineeringVO vo) {
if(vo == null) {
vo = new ProjectEngineeringVO();
--
Gitblit v1.8.0