Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java

@@ -11,4 +11,12 @@
    */

   public void addDeviceActive(DeviceActive deviceActive);



   /**

    * 
    * @param device 设备号

    * @param platform 平台类型

    * @return

    */

   public DeviceActive getDeviceByDeviceAndPlatform(String device, String deviceToken, String platform);

	
}