Merge remote-tracking branch 'origin/master'

tangzy

2021-09-23 96d31712c6654b2b71ed04696a9bb30af4d7f79a

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.java

@@ -16,10 +16,11 @@
 */
package org.springblade.modules.record.mapper;

import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.vo.RecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.vo.RecordVO;

import java.util.List;

/**