Merge remote-tracking branch 'origin/div' into div

yujian

2020-04-15 b907ba5b12a98e31d56c8847769875906a682b98

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

@@ -28,5 +28,12 @@
    * @return

    */

   public DeviceActive getFirstActiveInfo(String device);

	
   /**

    * 根据IMEI查询

    * @param imei

    * @return

    */

   public DeviceActive getFirstActiveInfoByImei(String imei);



}