From 93d6fdb255ebd9d33adebc4e96ecc5f74b6281ea Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 08 三月 2022 14:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
index bf8755e..2aa6a10 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/WaterQualityEquipmentMapper.java
@@ -1,9 +1,15 @@
 package com.sandu.ximon.dao.mapper;
 
 import com.sandu.common.domain.BaseMapper;
+import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
 import com.sandu.ximon.dao.domain.WaterQualityEquipment;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface WaterQualityEquipmentMapper extends BaseMapper<WaterQualityEquipment> {
+    List<WaterQualityEquipmentBo> listWaterQualityEquipment();
+
+    List<WaterQualityEquipmentBo> listWaterQualityEquipmentByIds(String keyword, Long clientId);
 }

--
Gitblit v1.9.3