From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/java/com/ycl/domain/entity/ProjectInfo.java | 22 ++++++++++++++++++----
1 files changed, 18 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 177a90a..6b70800 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectInfo.java
@@ -62,9 +62,9 @@
/** 鎶曡祫绫诲埆锛�0浼佷笟鎶曡祫锛�1鏀垮簻鎶曡祫锛�2澶栧晢鎶曡祫锛�3澧冨鎶曡祫锛� */
private String investType;
-// @TableField("project_phase")
-// /** 椤圭洰闃舵(0鍌ㄥ瑙勫垝闃舵, 1椤圭洰鍓嶆湡闃舵, 2瀹炴柦闃舵, 3绔ｅ伐鎶曠敤闃舵) */
-// private String projectPhase;
+ @TableField("project_phase")
+ /** 椤圭洰闃舵(1鍌ㄥ瑙勫垝闃舵, 2椤圭洰鍓嶆湡闃舵, 3瀹炴柦闃舵, 4绔ｅ伐鎶曠敤闃舵) */
+ private String projectPhase;
@TableField("tag")
/** 鏍囩 */
@@ -73,6 +73,14 @@
@TableField("competent_department")
/** 涓荤閮ㄩ棬(瀵瑰簲瀹℃壒閮ㄩ棬id) */
private String competentDepartment;
+
+ @TableField("competent_department_person")
+ /** 涓荤閮ㄩ棬鑱旂郴浜� */
+ private String competentDepartmentPerson;
+
+ @TableField("competent_department_phone")
+ /** 涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */
+ private String competentDepartmentPhone;
@TableField("area")
/** 琛屾斂鍖哄煙 */
@@ -164,10 +172,16 @@
@TableField("remark")
/** 瀹℃牳淇℃伅 */
private String remark;
+
@TableField("industry_competent_department")
+ /** 琛屼笟涓荤閮ㄩ棬 */
private Long industryCompetentDepartment;
+
@TableField("industry_competent_department_person")
- private Long industryCompetentDepartmentPerson;
+ /** 琛屼笟涓荤閮ㄩ棬鑱旂郴浜� */
+ private String industryCompetentDepartmentPerson;
+
@TableField("department_person_phone")
+ /** 琛屼笟涓荤閮ㄩ棬鑱旂郴鏂瑰紡 */
private String departmentPersonPhone;
}
--
Gitblit v1.8.0