Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/record/service/IRecordService.java

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