Skip to content

GMBase
GMBase
Commit f2327d61 authored by 叶凤鸣's avatar 叶凤鸣
Browse files
Options

Merge branch 'master' into yefengming/tabName

parents dd50f19d 4cfd2a3f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
GMBase/Classes/GMObject.h
View file @ f2327d61
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
// Copyright (c) 2015 Wanmeichuangyi. All rights reserved. // Copyright (c) 2015 Wanmeichuangyi. All rights reserved.
// //
@import GMJSONModel; #import <GMJSONModel/GMJSONModel-umbrella.h>
//@import GMJSONModel;
@interface GMObject : JSONModel @interface GMObject : JSONModel
......
GMBase/Classes/WMBaseViewController.h
View file @ f2327d61
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "OCNavigationBar.h" #import "OCNavigationBar.h"
#import <GMPhobos/GMPhobos-umbrella.h> #import <GMPhobos/GMPhobos-umbrella.h>
@import GMKit; #import <GMKit/GMKit-umbrella.h>
//@import GMKit;
@interface WMBaseViewController : UIViewController <OCNavigationBarDelegate, GMEmptyViewDelegate> @interface WMBaseViewController : UIViewController <OCNavigationBarDelegate, GMEmptyViewDelegate>
@property (nonatomic, strong) OCNavigationBar *navigationBar; @property (nonatomic, strong) OCNavigationBar *navigationBar;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment