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

admin

2019-09-20 db88b87df461820152d68d3d55a28f30c2da83e6

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

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