From 55819f6adb25e414ab69f95d73588b8029e83a9a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 d5eec5c..5414527 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -49,9 +49,9 @@
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
private String investType;
- @TableField("project_phase")
- /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
- private String projectPhase;
+// @TableField("project_phase")
+// /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
+// private String projectPhase;
@TableField("tag")
/** 鏍囩 */
@@ -123,7 +123,7 @@
@TableField("project_owner_unit")
/** 椤圭洰涓氫富鍗曚綅 */
- private String projectOwnerUnit;
+ private Long projectOwnerUnit;
@TableField("project_contact_person")
/** 椤圭洰鑱旂郴浜� */
@@ -141,5 +141,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