Merge branch 'dev'

This commit is contained in:
pikacode 2016-12-08 10:34:48 +08:00
commit 399d159757

View File

@ -78,7 +78,7 @@
@end
static JPushPlugin *SharedJPushPlugin;
JPushPlugin *SharedJPushPlugin;
@interface NSDictionary (JPush)
-(NSString*)toJsonString;