Merge branch 'master' into div

yujian

2019-07-11 1510301f5673631ad24fb5634bff5d504eda5ccd

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

   

}