From 5d686103fbb4361bebc305c731c9358d038e2836 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 02 Nov 2017 13:41:24 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/task.git
---
src/main/java/com/moral/monitor/entity/History.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/moral/monitor/entity/History.java b/src/main/java/com/moral/monitor/entity/History.java
index d417fb2..4b8af56 100644
--- a/src/main/java/com/moral/monitor/entity/History.java
+++ b/src/main/java/com/moral/monitor/entity/History.java
@@ -2,17 +2,27 @@
import java.util.Date;
-/**
- * Created by a on 2017/6/20.
- * ������������������������������������������������
- */
public class History {
+
+ private Integer id;
+
private String mac;
+
private String sensor;
+
private String mac_key;
+
private Double mac_value;
+
private Date time;
- private String units;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
public String getMac() {
return mac;
@@ -53,12 +63,4 @@
public void setTime(Date time) {
this.time = time;
}
-
- public String getUnits() {
- return units;
- }
-
- public void setUnits(String units) {
- this.units = units;
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0