From 644ed3e30bbee9a417dfbe649f2a72df25a7efb1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 537391c..9f1ca01 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -72,7 +72,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
+	IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
 
 	/**
 	 * 自定义分页
@@ -254,4 +254,17 @@
 	 */
 	List selectPeo(UserVO user);
 
+	/**
+	 * 查询用户年龄
+	 * @param id
+	 * @return
+	 */
+    int getUserAge(long id);
+
+	/**
+	 * 查询保安证编号位数
+	 * @param pre
+	 * @return
+	 */
+	Integer getSecurityPaperCount(String pre);
 }

--
Gitblit v1.9.3