From abde38d6baba3b50df5e39daba87a93c372e0675 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Fri, 13 Sep 2024 19:03:13 +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 |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 daee394..d723148 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
@@ -1,6 +1,7 @@
 package cn.gistack.sm.sg.DO;
 
 import cn.gistack.sm.sg.VO.PreAcceVO;
+import cn.gistack.sm.sg.VO.PtypeVO;
 import cn.gistack.sm.sg.VO.SgTypeVO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -172,7 +173,7 @@
 
 
 	@TableField(exist = false)
-	private List<SgTypeVO> sgGxDOS;
+	private List<PtypeVO> ptypeVOS;
 	@TableField(exist = false)
 	private List<PreAcceVO> preAcce;
 
@@ -180,7 +181,6 @@
 
 	private Integer status;
 
-	@TableField(exist = false)
 	private String projectProgress;
 
 	@TableField(exist = false)
@@ -201,4 +201,29 @@
 	 */
 	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