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

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

@@ -46,6 +46,10 @@
     
     [self setNavi];
     self.view.backgroundColor = [UIColor whiteColor];
+    
+    if (!self.caller) {
+        self.caller = @"";
+    }
 //    // Do any additional setup after loading the view.
 //    self.webView = [[UIWebView alloc ]initWithFrame:self.view.bounds];
 //    [self.view addSubview:self.webView];

shiku_im/shiku_im/文件夹1/设备管理/views/查寻cell/LYYDMDataSearchColectCell.m

@@ -47,7 +47,9 @@
     _model = model;
     self.leftlabel.text = model.nameSting;
     if ([model.nameSting isEqualToString:@"设备编号"]) {
-//        self.rightlabel.textColor = Color(6, 143, 235, 1.0);
+        self.rightlabel.textColor = Color(6, 143, 235, 1.0);
+    }else{
+        self.rightlabel.textColor = HexColor(@"#333333");
     }
     self.rightlabel.text = model.imageString;