冲突文件

yujian

2019-06-20 ecf9f0669734d4397aa1277f9a22f515aa410062

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

   

}