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

admin

2019-09-23 ee582a5d091966cf2324653c53a7553623e09730

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/push/DeviceActiveMapper.java

@@ -27,4 +27,6 @@
   
   DeviceActive selectFirst(String device);
   
   DeviceActive selectFirstByImei(String imei);
	
}