Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

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

   

}