From 82c1e7ced425f43781b0cd01290fad298f51e623 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期六, 29 六月 2019 13:27:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sensor.git into dev_lxw
---
sensor/src/com/fgkj/dto/Sensor_hisdata.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/sensor/src/com/fgkj/dto/Sensor_hisdata.java b/sensor/src/com/fgkj/dto/Sensor_hisdata.java
index 9ffb934..aef841a 100644
--- a/sensor/src/com/fgkj/dto/Sensor_hisdata.java
+++ b/sensor/src/com/fgkj/dto/Sensor_hisdata.java
@@ -7,6 +7,7 @@
private int num;
private int sensor_dev_id;
private Date record_time;
+ private Date record_time1;
private float airtmp;
private float airhum;
private int smoke;
@@ -95,12 +96,19 @@
public void setNote(String note) {
this.note = note;
}
+ public Date getRecord_time1() {
+ return record_time1;
+ }
+ public void setRecord_time1(Date record_time1) {
+ this.record_time1 = record_time1;
+ }
@Override
public String toString() {
return "Sensor_hisdata [num=" + num + ", sensor_dev_id="
- + sensor_dev_id + ", record_time=" + record_time + ", airtmp="
- + airtmp + ", airhum=" + airhum + ", smoke=" + smoke
- + ", water=" + water + ", lightintensity=" + lightintensity
+ + sensor_dev_id + ", record_time=" + record_time
+ + ", record_time1=" + record_time1 + ", airtmp=" + airtmp
+ + ", airhum=" + airhum + ", smoke=" + smoke + ", water="
+ + water + ", lightintensity=" + lightintensity
+ ", CO2concentration=" + CO2concentration
+ ", COconcentration=" + COconcentration
+ ", CH4concentration=" + CH4concentration
--
Gitblit v1.9.1