Merge remote-tracking branch 'origin/master'

liuhaonan

2022-01-18 9f4c4e77bd7936645d174f21a6abf8951b533e8d

 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;
}