冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 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);