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/record/mapper/RecordMapper.java

@@ -40,5 +40,5 @@
    * @return
    */
   List<RecordVO> selectRecordPage(IPage page, RecordVO record);
   Map selectIn(String cardid);
   Map selectIn(String cardid,String type);
}