冲突产生的文件

yujian

2019-06-25 e048db91382fa13e0b53e170390eea5fb5931221

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/DeviceLotteryRecordService.java

@@ -15,5 +15,7 @@
   public int updateByPrimaryKey(DeviceLotteryRecord record);



   public List<DeviceLotteryRecord> listByPlatformAndDevice(int platform, String device);



   public int deleteByPrimaryKey(Long id);

   

}