Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-05 b63c28a0c24782753eae26892171dd1a0c8d1fe7

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