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/statisticsVO/StatisticsTableProject.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTableProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTableProject.java
index 13d9419..747d844 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTableProject.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/statisticsVO/StatisticsTableProject.java
@@ -43,12 +43,18 @@
 
 	private int smallTwoNumAll;
 
-	private double dykeLength;
+	private double dykeLength;//危害长度
+	private double levelOneLength;//一级危害长度
+	private double levelTwoLength;//二级危害长度
+	private double levelThreeLength;//三级危害长度
+	private double levelFourLength;//四级危害长度
+	private double levelFiveLength;//五级危害长度
 
-	private double levelOneLength;
-	private double levelTwoLength;
-	private double levelThreeLength;
-	private double levelFourLength;
-	private double levelFiveLength;
+	private double dykeLengthAll;//提防总长度
+	private double levelOneLengthAll;//一级提防长度
+	private double levelTwoLengthAll;//二级提防长度
+	private double levelThreeLengthAll;//三级提防长度
+	private double levelFourLengthAll;//四级提防长度
+	private double levelFiveLengthAll;//五级提防长度
 
 }

--
Gitblit v1.9.3