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

admin

2019-08-22 79f52f6eee352a83876233b0e21194cf9d50e4c1

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