Merge remote-tracking branch 'origin/master'

liuhaonan

2022-02-28 161ec503806c8b71f5caa2d42c2fa9c03ca062d6

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

@@ -5,6 +5,6 @@
@Data
public class LampCount {

    private Integer id;
    private Long id;
    private Integer count;
}