From ae347a6603c94f73462c9c3e39c3e04476556d6e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
index 2029fa3..5053aa7 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -33,6 +33,10 @@
/** 寤鸿鍐呭 */
private String content;
+ @TableField("construction_nature")
+ /** 寤鸿鎬ц川 */
+ private String constructionNature;
+
@TableField("project_type")
/** 椤圭洰绫诲瀷锛�0鎴垮眿寤虹瓚锛�1鍩庡競鍩虹璁炬柦锛�2浜ら�氳繍杈擄紝3姘村埄锛�4鑳芥簮锛�5闈炵叅鐭垮北锛�6鍏朵粬锛� */
private String projectType;
@@ -97,17 +101,17 @@
/** 璁″垝绔ｅ伐鏃堕棿 */
private Date planCompleteTime;
- @TableField("win_unit")
- /** 涓爣鍗曚綅 */
- private String winUnit;
-
- @TableField("win_amount")
- /** 涓爣閲戦 */
- private String winAmount;
-
- @TableField("win_time")
- /** 涓爣鏃堕棿 */
- private Date winTime;
+// @TableField("win_unit")
+// /** 涓爣鍗曚綅 */
+// private String winUnit;
+//
+// @TableField("win_amount")
+// /** 涓爣閲戦 */
+// private String winAmount;
+//
+// @TableField("win_time")
+// /** 涓爣鏃堕棿 */
+// private Date winTime;
@TableField("project_address")
/** 璇︾粏鍦板潃 */
@@ -123,7 +127,7 @@
@TableField("project_owner_unit")
/** 椤圭洰涓氫富鍗曚綅 */
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
@TableField("project_contact_person")
/** 椤圭洰鑱旂郴浜� */
@@ -141,5 +145,14 @@
/** 鍒涘缓浜� */
private Long createBy;
+ @TableField("used_status")
+ /** 浣跨敤鐘舵�侊紙0锛氳崏绋匡紝1锛氭彁浜�,2:瀹℃牳閫氳繃锛�-1锛氶┏鍥烇級 */
+ private Integer usedStatus;
+ @TableField("coding")
+ /** 缂栫爜 */
+ private String coding;
+ @TableField("remark")
+ /** 瀹℃牳淇℃伅 */
+ private String remark;
}
--
Gitblit v1.8.0