From 9ef627b0d70fd2d8cfce6b70c7f809f1865a1ea9 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 13 一月 2022 17:08:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 622aa09..50ec96d 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
@@ -16,7 +16,7 @@
@Data
public class Light implements Serializable {
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long lightId;
@@ -32,15 +32,25 @@
private String remark;
/**
+ * 鐏�1浜害鐧惧垎姣旓紝0-100
+ */
+ private Integer lightPercent;
+
+ /**
+ * 鐏�2浜害鐧惧垎姣旓紝0-100
+ */
+ private Integer light2Percent;
+
+ /**
* 鍒涘缓鏃堕棿
*/
private LocalDateTime createTime;
/**
- *
+ *
*/
private LocalDateTime updateTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3