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

admin

2019-10-12 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f

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

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