Merge remote-tracking branch 'origin/master'

liuhaonan

2022-01-18 9f4c4e77bd7936645d174f21a6abf8951b533e8d

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

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





    List<Long> listMonitorId(String keyword, Long clientId, int bindingState);

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