Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -417,7 +417,7 @@ private extension YHPreviewViewModel {
             var msg = YHConstantArrayData.getShowNameBy(indexStr: model.sex, type: .sex)
             let tmp5 = YHPreviewQuestionAndAnswerModel(question: "性别：", answer: msg)
             
-            msg = YHConstantArrayData.getShowNameBy(indexStr: model.married, type: .marry)
+            msg = model.married//后台 王辉维护这个字段 前端直接展示
             let tmp6 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: msg)
             
             let tmp7 = YHPreviewQuestionAndAnswerModel(question: "手机号：", answer: model.mobile)

galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift

@@ -40,6 +40,14 @@ extension String {
         }
         return nil
     }
+    
+    //判断字符串并返回默认值
+    func defaultStringIfEmpty(detaultValue : String = "-") -> String {
+        if self.isEmpty {
+            return detaultValue
+        }
+        return self
+    }
 }
 
 extension String {