Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-21 e41b1b4d8744eccf44979e29526e7dd15c8af5eb

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

@@ -11,3 +11,7 @@
    List<Monitor> listMonitorByKeyword(String keyword, int equipmentState1, int equipmentState2,
                                       int bindingState1, int bindingState2);
}