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/LightReportData.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java
index f2fa8f6..101b032 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightReportData.java
@@ -24,7 +24,7 @@
/**
* 璁惧mac
*/
- private String deviceMac;
+ private String deviceCode;
/**
* 甯傜數鐢靛帇
@@ -57,11 +57,16 @@
private Double reactivePower;
/**
- * 浜害鐧惧垎姣旓紝0-100
+ * 鐏�1浜害鐧惧垎姣旓紝0-100
*/
private Integer lightPercent;
/**
+ * 鐏�2浜害鐧惧垎姣�
+ */
+ private Integer light2Percent;
+
+ /**
* 鏈�杩戜竴娆′寒鐏椂闂�
*/
private Long recentlyLightSec;
--
Gitblit v1.9.3