From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 14 三月 2025 11:43:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java b/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
index 334a8db..4b8d65b 100644
--- a/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
+++ b/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.base.AbsQuery;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -23,6 +24,8 @@
private String projectName;
//椤圭洰浠ｇ爜
private String projectCode;
+ //寤鸿鎬ц川
+ private String constructionNature;
//椤圭洰绫诲瀷
private String projectType;
//閲嶇偣鍒嗙被
@@ -47,5 +50,19 @@
private Date projectStartTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date projectEndTime;
+ //浠庢湁娌℃湁娴佺▼鍒ゆ柇鏄瓨鍌ㄨ繕鏄棭鏈�
+ private String reserveOrPrevious;
+ private Integer role;// 涓氫富锛�0锛屽鏍革細1
+ //鏌ヨ鏉′欢涓氫富鍗曚綅
+ private Long projectOwnerUnit;
+ private Integer usedStatus;
+ //鏌ヨ鏉′欢涓荤閮ㄩ棬
+ private Long competentDepartment;
+
+ @ApiModelProperty("鏄惁鏄紓甯搁」鐩煡璇細0 涓嶆槸 1鏄�")
+ private Integer exe;
+
+ @ApiModelProperty("鏄惁鏄」鐩腑蹇冩煡璇細0 涓嶆槸 1鏄�")
+ private Integer center;
}
--
Gitblit v1.8.0