From 40d262e091d43b15c082260b7279daf4e89b2799 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 07:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 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 071663f..d3247c9 100644
--- a/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
+++ b/business/src/main/java/com/ycl/domain/query/ProjectInfoQuery.java
@@ -1,8 +1,12 @@
 package com.ycl.domain.query;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ycl.system.domain.base.AbsQuery;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 椤圭洰绠$悊鍩虹淇℃伅琛ㄦ煡璇�
@@ -13,5 +17,37 @@
 @Data
 @ApiModel(value = "ProjectInfo鏌ヨ鍙傛暟", description = "椤圭洰绠$悊鍩虹淇℃伅琛ㄦ煡璇㈠弬鏁�")
 public class ProjectInfoQuery extends AbsQuery {
+    //椤圭洰绫诲埆
+    private String projectCategory;
+    //椤圭洰鍚嶇О
+    private String projectName;
+    //椤圭洰浠g爜
+    private String projectCode;
+    //椤圭洰绫诲瀷
+    private String projectType;
+    //閲嶇偣鍒嗙被
+    private String importanceType;
+    //椤圭洰鏍囩
+    private String tag;
+    //椤圭洰鐘舵��
+    private String projectStatus;
+    //椤圭洰鐮�
+    private String projectColorCode;
+    //鍏宠仈鐘舵��
+    private String assignmentStatus;
+    //璧勯噾绫诲瀷
+    private String fundType;
+    //椤圭洰闃舵
+    private String projectPhase;
+    //鎶曡祫绫诲埆
+    private String investType;
+    //琛屾斂鍖哄垝
+    private String area;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date projectStartTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date projectEndTime;
+    //浠庢湁娌℃湁娴佺▼鍒ゆ柇鏄瓨鍌ㄨ繕鏄棭鏈�
+    private String reserveOrPrevious;
 }
 

--
Gitblit v1.8.0