From 5ff099fc8a7271da4de8ff950b31a7dc15490d94 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 27 Oct 2017 16:49:43 +0800
Subject: [PATCH] 更换 import 引用
---
src/main/java/com/moral/monitor/entity/History.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/monitor/entity/History.java b/src/main/java/com/moral/monitor/entity/History.java
index b0ae9d5..4b8af56 100644
--- a/src/main/java/com/moral/monitor/entity/History.java
+++ b/src/main/java/com/moral/monitor/entity/History.java
@@ -3,15 +3,16 @@
import java.util.Date;
public class History {
+
private Integer id;
private String mac;
private String sensor;
- private String macKey;
+ private String mac_key;
- private Double macValue;
+ private Double mac_value;
private Date time;
@@ -28,7 +29,7 @@
}
public void setMac(String mac) {
- this.mac = mac == null ? null : mac.trim();
+ this.mac = mac;
}
public String getSensor() {
@@ -36,23 +37,23 @@
}
public void setSensor(String sensor) {
- this.sensor = sensor == null ? null : sensor.trim();
+ this.sensor = sensor;
}
- public String getMacKey() {
- return macKey;
+ public String getMac_key() {
+ return mac_key;
}
- public void setMacKey(String macKey) {
- this.macKey = macKey == null ? null : macKey.trim();
+ public void setMac_key(String mac_key) {
+ this.mac_key = mac_key;
}
- public Double getMacValue() {
- return macValue;
+ public Double getMac_value() {
+ return mac_value;
}
- public void setMacValue(Double macValue) {
- this.macValue = macValue;
+ public void setMac_value(Double mac_value) {
+ this.mac_value = mac_value;
}
public Date getTime() {
--
Gitblit v1.8.0