Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-24 2de45155f323dd5371e9bb7432bd94b742d5cb77

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

@@ -20,6 +20,4 @@
    private int equipmentState;
    //接入时间
    private LocalDateTime createTime;
    //所属人
    private Long userId;
}