From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/ISecurityService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/ISecurityService.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/ISecurityService.java
index 93af313..7498e31 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/ISecurityService.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/service/ISecurityService.java
@@ -39,7 +39,7 @@
 	 * @param security
 	 * @return
 	 */
-	IPage<SecurityVO> selectSecurityPage(IPage<SecurityVO> page, SecurityVO security);
+	IPage<SecurityVO> selectSecurityPage(IPage<SecurityVO> page, Security security);
 	List<SecurityVO> selectList();
 	List<SecurityVO> selectInfo(String snumber);
 	List<Map<String, Object>> selectry();

--
Gitblit v1.9.3