From 7c3738df442e6b456ca68670e086357fbb08d521 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 28 四月 2022 18:25:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
index 50ec96d..bac6c57 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
/**
@@ -32,6 +34,11 @@
private String remark;
/**
+ * 鐏ご鏁伴噺锛岄粯璁ゅ弻鐏ご銆�1锛氬崟鐏ご锛�2锛氬弻鐏ご
+ */
+ private int lightCount;
+
+ /**
* 鐏�1浜害鐧惧垎姣旓紝0-100
*/
private Integer lightPercent;
@@ -42,6 +49,13 @@
private Integer light2Percent;
/**
+ * 鍔熺巼
+ */
+ private Integer power1;
+
+ private Integer power2;
+
+ /**
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
@@ -51,6 +65,12 @@
*/
private LocalDateTime updateTime;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0锛氱绾� 1锛氬湪绾�
+ */
+ @TableField(exist = false)
+ private Integer onlineStatus;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
--
Gitblit v1.9.3