冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/DeviceLotteryRecordServiceImpl.java

@@ -18,6 +18,11 @@


   

   @Override

   public int deleteByPrimaryKey(Long id) {

      return reviceLotteryRecordMapper.deleteByPrimaryKey(id);

   }

	
   @Override

   public int insertSelective(DeviceLotteryRecord record) {

      return reviceLotteryRecordMapper.insertSelective(record);

   }