Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-24 bef458cd14d2e0f2b09d76b609291f47be3cd525

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

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


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

    List<String> listMonitorDeviceSerial();
    List<String> listMonitorDeviceSerial(Long userid, String keyword);
}