From 759bbb8ee99665382a689fa90277a9b2279238da Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 19:04:02 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java
index 85c6343..19b2d8e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java
@@ -5,6 +5,7 @@
 import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfo;
 import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoDetailDO;
 import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
 import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesDBQuery;
 import com.gkhy.safePlatform.emergency.repository.EmergencySuppliesInfoRepository;
 import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
@@ -44,5 +45,10 @@
         emergencySuppliesInfoRepository.deleteEmergencySupplies(SuppliesId);
     }
 
+    @Override
+    public List<EmergencySuppliesInfoDetailDO> countEmergencySupplies(Page<EmergencySuppliesInfoDetailDO> page,EmergencySuppliesCountQuery query){
+        return emergencySuppliesInfoRepository.countEmergencySupplies(page,query);
+    }
+
 
 }

--
Gitblit v1.9.2