From c45329384de9af039447d7ea15003415b425a624 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 26 Feb 2018 09:32:13 +0800
Subject: [PATCH] test
---
src/main/java/com/moral/monitor/entity/Sensor.java | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/moral/monitor/entity/Sensor.java b/src/main/java/com/moral/monitor/entity/Sensor.java
index 796f42a..f9ba8ec 100644
--- a/src/main/java/com/moral/monitor/entity/Sensor.java
+++ b/src/main/java/com/moral/monitor/entity/Sensor.java
@@ -1,27 +1,41 @@
package com.moral.monitor.entity;
-/**���������������
- * Created by a on 2017/4/10.
- */
public class Sensor {
- private int id;
+
+ private Integer id;
+
private String type;
+
private String sensor;
+
private String sensor_desc;
+
private String mac_key;
+
private String upper;
+
private String lower;
+
private String units;
- private int digit;
+
+ private Integer digit;
+
private String ver;
-
- public int getId() {
+ public Integer getId() {
return id;
}
- public void setId(int id) {
+ public void setId(Integer id) {
this.id = id;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
}
public String getSensor() {
@@ -72,20 +86,12 @@
this.units = units;
}
- public int getDigit() {
+ public Integer getDigit() {
return digit;
}
- public void setDigit(int digit) {
+ public void setDigit(Integer digit) {
this.digit = digit;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
}
public String getVer() {
@@ -95,4 +101,4 @@
public void setVer(String ver) {
this.ver = ver;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0