From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
index 37ff7b7..659ddfc 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java
@@ -181,7 +181,6 @@
 
 	private Integer status;
 
-	@TableField(exist = false)
 	private String projectProgress;
 
 	@TableField(exist = false)
@@ -202,4 +201,30 @@
 	 */
 	private String lot;
 
+
+	/**
+	 * 表面变形
+	 */
+	private int surfaceNum;
+	private String surfaceProgress;
+
+	/**
+	 * 视频
+	 */
+	private int videoNum;
+	private String videoProgress;
+
+	/**
+	 * 渗流压力
+	 */
+	private int transNum;
+	private String transProgress;
+
+	/**
+	 * 渗流量
+	 */
+	private int seepageNum;
+	private String seepageProgress;
+
+
 }

--
Gitblit v1.9.3