From 2de45155f323dd5371e9bb7432bd94b742d5cb77 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 24 十二月 2021 18:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java
index 87660ae..c655acf 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/WaterQualityData.java
@@ -11,20 +11,18 @@
public class WaterQualityData implements Serializable {
@TableId(type = IdType.AUTO)
private Long id;
- //璁惧ID
- private Long equipmentId;
//姘磋川璁惧缂栫爜
private String waterQualityEquipmentCode;
//鎵�灞炵伅鏉�
private String belongTo;
//姘磋川閰哥⒈搴H
- private Double waterQualityPh;
+ private String waterQualityPh;
//姘磋川婧惰В搴O锛坢g/L锛�
- private Double waterQualityDo;
+ private String waterQualityDo;
//姘磋川鐢靛鐜嘐C(10^(-6)S)
- private Double waterQualityEc;
+ private String waterQualityEc;
//姘磋川娴婂害锛圢TU锛�
- private Double waterQualityNtu;
+ private String waterQualityNtu;
//涓婃姤鏃堕棿
private LocalDateTime updateTime;
//鍒涘缓鏃堕棿
--
Gitblit v1.9.3