From 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 02 Dec 2020 14:39:08 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/Sensor.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/entity/Sensor.java b/src/main/java/com/moral/entity/Sensor.java
index 32502d1..3f24712 100644
--- a/src/main/java/com/moral/entity/Sensor.java
+++ b/src/main/java/com/moral/entity/Sensor.java
@@ -1,9 +1,8 @@
package com.moral.entity;
-import lombok.Data;
-
-import javax.persistence.Column;
import javax.persistence.Id;
+
+import lombok.Data;
@Data
public class Sensor {
@@ -12,8 +11,7 @@
private String name;
- @Column(name = "`key`")
- private String key;
+ private String sensorKey;
private Double upper;
--
Gitblit v1.8.0