Merge remote-tracking branch 'origin/master'

liuhaonan

2022-02-28 161ec503806c8b71f5caa2d42c2fa9c03ca062d6

 dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java

@@ -15,7 +15,9 @@
    List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);


    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState);
    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);

    List<String> listMonitorDeviceSerial();
}