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/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
index 8e2446c..5c24c56 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
@@ -36,16 +36,16 @@
 	private Date recordTime;
 
 	//监测值
-	private String val;
+	private Double val;
 
 	//水平监测值
-	private String deVal;
+	private Double deVal;
 
 	//上下监测值
-	private String dnVal;
+	private Double dnVal;
 
 	//位移垂直监测值
-	private String duVal;
+	private Double duVal;
 
 	//描述
 	private String description;

--
Gitblit v1.9.3