Merge branch 'master' of ssh://10.10.100.21/source/iOSUU

shiku_im/shiku_im/RN/Controllers/YRRnChartsAllVC.m

@@ -54,9 +54,9 @@ static RCTRootView *rootView = nil;
     if (!rootView) {
     
         NSURL *jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-    
+        
         jsCodeLocation = [CodePush bundleURL];
-    
+        
 //        NSString * strUrl = @"http://10.1.80.96:8081/index.bundle?platform=ios";
 //        jsCodeLocation = [NSURL URLWithString:strUrl] ;
     

shiku_im/shiku_im/controller/DocumentVC.m

@@ -219,7 +219,7 @@ static NSString *cellID = @"cellID";
     NSString *ip = [UASUserInfo shareManager].urlIp;
     NSString *sessionId = [[NSUserDefaults standardUserDefaults] stringForKey:@"sessionId"];
     NSString *url = [NSString stringWithFormat:@"%@mobile/common/getformandgriddetail.action?caller=%@&condition=1=1&sessionId=%@&id=0",ip,caller,sessionId];
-
+    
     SLog(@"各大通用表单新增URL:%@",url);
     
     url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];

shiku_im/shiku_im/controller/myOA/JOOAOutSelectAddressVC.m

@@ -1146,6 +1146,7 @@
 {
     
     _mapView.showsUserLocation=NO;//停止定位;
+    
 }
 
 - (NSString *)getNetWorkStates

shiku_im/shiku_im/文件夹1/WorkMain(工作新页面)/Others/UASWorkData.m

@@ -857,6 +857,7 @@
         [_dataDic setObject:_allDataArr forKey:@"allDataArr"];
         [_dataDic setObject:@NO forKey:@"isNoData"];
         [_dataDic setObject:_oringArr forKey:@"oringArr"];
+        //读取一次数据后将数据先缓存在本地
         [self saveData];
         
     }