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-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProjectInfoDO.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 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..8adc7b6 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,42 @@
 	 */
 	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;
+
+	/**
+	 * 水库注册码
+	 */
+	@TableField(exist = false)
+	private String othRegCd;
+
+	/**
+	 * 设备价格排序
+	 */
+	@TableField(exist = false)
+	private String price;
+
+
 }

--
Gitblit v1.9.3