From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
index 4a0b880..f4d9944 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbProject.java
@@ -59,9 +59,15 @@
@TableField("\"plan_url\"")
private String planUrl;
+ @TableField("\"plan_name\"")
+ private String planName;
+
//方案批复，逗号分隔字符串xxxx,xxxx
@TableField("\"plan_feed_back_url\"")
private String planFeedBackUrl;
+
+ @TableField("\"plan_feed_back_name\"")
+ private String planFeedBackName;
//是否政府采购，1是；2否
@TableField("\"is_gov_purchase\"")
@@ -75,6 +81,9 @@
@TableField("\"gov_url\"")
private String govUrl;
+ @TableField("\"gov_name\"")
+ private String govName;
+
//合同签订时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -84,6 +93,9 @@
//合同附件
@TableField("\"contract_url\"")
private String contractUrl;
+
+ @TableField("\"contract_name\"")
+ private String contractName;
//计划验收时间
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -105,6 +117,9 @@
@TableField("\"check_url\"")
private String checkUrl;
+ @TableField("\"check_name\"")
+ private String checkName;
+
//是否校验
@TableField("\"check_state\"")
private String checkState;
--
Gitblit v1.9.3