Merge branch 'dev1'

Administrator

2018-12-25 4fa67c8de0fe4c3726a0b84db38316568768506c

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

	
}