Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-20 a091a0552ba1374386910571ab9d929f84582fb5

 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;