Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 f7fc1e040ca7533b0bece2a02eb72dd3645ed4d0

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