root/ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop

Browse Source 
# Conflicts:
#	Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
#	Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
This commit is contained in:
jiangxuefei718
2019-03-19 16:42:03 +08:00
parent 73b993aea9 5f488b14b8
commit a1f9494a73
6 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ifish/controllers/IfishTabControllers/设备/IfishDeviceViewController.m
-1
View File
@@ -41,7 +41,6 @@
#import "IfishAlibcWebViewController.h"
#import "MBProgressHUD.h"
#import "NTESSessionListViewController.h"
#import "RunSun84biteCenterViewController.h"
#import "RunSunChangeNameViewController.h"
@interface IfishDeviceViewController ()<UITableViewDelegate,UITableViewDataSource,LxPopViewDelegate,ShopTtemListDelegate,NIMSystemNotificationManagerDelegate,NIMConversationManagerDelegate>