Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-11 da823ef0819982dfa74bb0b7a9ce6d534d2fcc2d

 dao/src/main/java/com/sandu/ximon/dao/domain/LampCount.java

@@ -4,6 +4,7 @@

@Data
public class LampCount {
    private Integer id;

    private Long id;
    private Integer count;
}