Merge remote-tracking branch 'origin/master'

zengh

2021-09-10 3b1bba4cae03694d1364115b9cd539bee066ce7e

 src/main/java/org/springblade/modules/permit/service/impl/PermitServiceImpl.java

@@ -41,8 +41,8 @@
   }

   @Override
   public Map selectIn(String cardid) {
      return baseMapper.selectIn(cardid);
   public Map selectIn(String cardid,String type) {
      return baseMapper.selectIn(cardid,type);
   }

   @Override