Merge remote-tracking branch 'origin/master'

zengh

2021-07-02 d4156c11179e8c85ae635063377447c967ee055a

 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();