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

shiku_im/shiku_im/controller/审批流详情/LYYApprovalDetailVC.m

@@ -657,7 +657,7 @@
     }
 }
 
-#pragma mark -- 同意 不同意，变更处理人，吓一跳
+#pragma mark -- 同意 不同意，变更处理人，下一条
 - (void)upLoadAgainBackToView:(UIButton *)sender
 {
     sender.backgroundColor = BGKJ_COLOR;
@@ -2864,7 +2864,7 @@
     [LYHTTPRequest Post:SPL_Disagree_Bill page:dic Completion:^(id ObjectData, NSError *error) {
         if (error == nil) {
             DLog(@"%@",ObjectData);
-            [JOShowMessageFromNavi showDropViewWithMessage:@"审批成功,即将为你跳转吓一跳" ToNavi:self.navigationController withColor:nil];
+            [JOShowMessageFromNavi showDropViewWithMessage:@"审批成功,即将为你跳转下一条" ToNavi:self.navigationController withColor:nil];
             [self nextTeam:sender];
         }else{
             
@@ -4714,7 +4714,7 @@
                             }
                             
                             if ([str11 stringByReplacingOccurrencesOfString:@" " withString:@""].length  != 0 || [str1 stringByReplacingOccurrencesOfString:@" " withString:@""].length != 0){
-                                
+                                SLog(@"名称:%@---类型:%@",[c objectForKey:@"FD_CAPTION"],[c objectForKey:@"FD_TYPE"]);
                                 if ([[c objectForKey:@"FD_TYPE"] isEqualToString:@"MS"]&& [str11 containsString:@"table"])
                                 {
                                     UIWebView *rightLbl = [self creatRightwebViewWithHeight:j text:str11];