From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据

---
 src/main/java/org/springblade/modules/recovery/service/RecoveryService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/recovery/service/RecoveryService.java b/src/main/java/org/springblade/modules/recovery/service/RecoveryService.java
index 07600b6..fa3c12f 100644
--- a/src/main/java/org/springblade/modules/recovery/service/RecoveryService.java
+++ b/src/main/java/org/springblade/modules/recovery/service/RecoveryService.java
@@ -5,6 +5,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.recovery.entity.Recovery;
 import org.springblade.modules.recovery.vo.RecoveryVO;
+import org.springblade.modules.stock.vo.StocksVO;
+
+import java.util.List;
 
 /**
  * 采收记录服务类
@@ -35,4 +38,8 @@
 	 * @return
 	 */
 	RecoveryVO getRecoveryDetail(Integer recoveryId);
+
+    IPage<RecoveryVO> recoveryStatistics(IPage<Object> page, RecoveryVO recoveryVO);
+
+	IPage<RecoveryVO> recoveryStatisticsx(IPage<Object> page, RecoveryVO recoveryVO);
 }

--
Gitblit v1.9.3