Merge remote-tracking branch 'origin/master'

liuhaonan

2022-02-28 161ec503806c8b71f5caa2d42c2fa9c03ca062d6

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

@@ -10,5 +10,6 @@
@Mapper
public interface WaterQualityEquipmentMapper extends BaseMapper<WaterQualityEquipment> {
    List<WaterQualityEquipmentBo> listWaterQualityEquipment();
    List<WaterQualityEquipmentBo> listWaterQualityEquipmentByKeyword(String keyword);

    List<WaterQualityEquipmentBo> listWaterQualityEquipmentByIds(String keyword, Long clientId);
}