Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

 src/main/java/org/springblade/modules/permit/service/IPermitService.java

@@ -40,6 +40,6 @@
    * @return
    */
   IPage<PermitVO> selectPermitPage(IPage<PermitVO> page, PermitVO permit);
   Map selectIn(String cardid);
   Map selectIn(String cardid,String type);
   void insertPer(@Param("permit") Permit permit);
}