Merge remote-tracking branch 'origin/master'

zengh

2021-08-28 99081be70e456268640014a6369c55c5fec29f2d

 src/main/java/org/springblade/modules/record/service/impl/RecordServiceImpl.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);
   }

}