Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-08 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea

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

@@ -1,6 +1,7 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.common.domain.BaseMapper;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import org.apache.ibatis.annotations.Mapper;

@@ -12,6 +13,11 @@
                                       int bindingState1, int bindingState2);

    List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);


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

    List<String> listMonitorDeviceSerial();
}