Merge remote-tracking branch 'origin/master'

MercuryZ

2022-10-18 ea94079e74182be590b9fff356c97f522d9a7828

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

@@ -12,7 +12,9 @@

    List<MonitorBo> listMonitorByIds(List<String> list, int equipmentState);

    List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState,String orderBy);
    List<MonitorBo> listMonitorDeviceSerial1(Long userid, String keyword, int bindingState, String orderBy);

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