Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-31 06c9ac9b43af8492a9dbd1eee1a309170eed71d9

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



}