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 |    5 +++++
 1 files changed, 5 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 5540329..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
@@ -34,6 +34,11 @@
     private String remark;
 
     /**
+     * 鐏ご鏁伴噺锛岄粯璁ゅ弻鐏ご銆�1锛氬崟鐏ご锛�2锛氬弻鐏ご
+     */
+    private int lightCount;
+
+    /**
      * 鐏�1浜害鐧惧垎姣旓紝0-100
      */
     private Integer lightPercent;

--
Gitblit v1.9.3