冲突文件

yujian

2019-06-20 ecf9f0669734d4397aa1277f9a22f515aa410062

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ExtractRecordMapper.java

@@ -7,6 +7,8 @@
public interface ExtractRecordMapper {

   int deleteByPrimaryKey(Long id);
	
   int deleteAll();

   int insert(ExtractRecord record);