Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-05 e9a3f108de4f79fe6f246cd30f4427fc6aad5450

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