Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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

@@ -22,4 +22,7 @@

   DeviceActive selectByDeviceToeknMd5AndPlatform(@Param("deviceTokenMd5") String deviceTokenMd5,
         @Param("platform") int platform);
	
   DeviceActive selectFirst(String device);
	
}