From 4bf0125f2cbc291b763a3c0a83629a470189a771 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jul 2019 16:34:18 +0800
Subject: [PATCH] 更新重合点逻辑及多点重合显示方式

---
 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