Merge remote-tracking branch 'origin/master'

liuhaonan

2022-02-28 161ec503806c8b71f5caa2d42c2fa9c03ca062d6

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

@@ -12,8 +12,8 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    //所属灯杆
    private String belongTo;
//    //所属灯杆
//    private String belongTo;
    //水质设备编码
    private String waterQualityEquipmentCode;
    //设备状态:在线:1/离线:0