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

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyDocuments(我的文书)/V/YHHKPlanItemView.swift

@@ -61,6 +61,8 @@ class YHHKPlanItemView: UIView {
         let view = UILabel()
         view.text = "所属专业名称(如有）：资深数据科学家"
         view.font = UIFont.PFSC_R(ofSize: 14)
+        view.numberOfLines = 0
+        view.lineBreakMode = .byWordWrapping
         view.textColor = .init(hex: 0x6D788A)
         return view
     }()
@@ -160,7 +162,7 @@ private extension YHHKPlanItemView {
         iconImageV.snp.makeConstraints { make in
             make.left.equalTo(nameLable.snp.right).offset(4)
             make.centerY.equalTo(nameLable)
-            make.height.width.equalTo(16)
+            make.height.width.equalTo(18)
         }
         
         iconImageV.isHidden = true

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

@@ -577,8 +577,11 @@ private extension YHPreviewViewModel {
         do {
             //国家信息
             let tmp0 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality)
-            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.is_handled == 0 ? "未办理" : "已办理")
-            let arr = [tmp0,tmp1]
+            var arr = [tmp0]
+            if model.nationality.contains("中国") {
+                let tmp1 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.is_handled == 0 ? "未办理" : "已办理")
+                arr.append(tmp1)
+            }
             let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "国籍信息", cellData0: arr)
             arrDataForMainApplicationInfo.append(model1)
         }