From a091a0552ba1374386910571ab9d929f84582fb5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 20 十二月 2021 14:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightRemark.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
similarity index 79%
rename from dao/src/main/java/com/sandu/ximon/dao/domain/LightRemark.java
rename to dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
index beba73c..622aa09 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightRemark.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
@@ -9,22 +9,22 @@
import lombok.Data;
/**
- * 璺伅澶囨敞琛�
- * @TableName light_remark
+ * 璺伅琛�
+ * @TableName light
*/
-@TableName(value ="light_remark")
+@TableName(value ="light")
@Data
-public class LightRemark implements Serializable {
+public class Light implements Serializable {
/**
*
*/
@TableId(type = IdType.AUTO)
- private Long id;
+ private Long lightId;
/**
* 璁惧璇嗗埆鐮�
*/
- private String deviceMac;
+ private String deviceCode;
/**
* 澶囨敞淇℃伅
--
Gitblit v1.9.3