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

yujian

2020-04-16 2241e0e63bf1b83b8ce5908bb6364382974e8fa2

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



}