// 高才

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1278,7 +1278,6 @@
 		04307BAF2D215D1C00ED8E8D /* YHRecommendedLiveHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRecommendedLiveHeader.swift; sourceTree = "<group>"; };
 		04307BB32D21623300ED8E8D /* YHRecommendedAppointmentLiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRecommendedAppointmentLiveView.swift; sourceTree = "<group>"; };
 		04307BB52D2180C300ED8E8D /* YHRecommendedOnLiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRecommendedOnLiveView.swift; sourceTree = "<group>"; };
-		045C09A12D12C2A800BD2DC0 /* YHGCMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMineSchemeViewController.swift; sourceTree = "<group>"; };
 		045C0A142D12CA5E00BD2DC0 /* YHBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
 		045C0A152D12CA5E00BD2DC0 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		045C0A162D12CA5E00BD2DC0 /* YHNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNavigationController.swift; sourceTree = "<group>"; };
@@ -6481,14 +6480,6 @@
 			path = VM;
 			sourceTree = "<group>";
 		};
-		04E86E212B81E9FA00A35F4B /* Recovered References */ = {
-			isa = PBXGroup;
-			children = (
-				045C09A12D12C2A800BD2DC0 /* YHGCMineSchemeViewController.swift */,
-			);
-			name = "Recovered References";
-			sourceTree = "<group>";
-		};
 		4758815B24BAF3CAA24EC6A8 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -6523,7 +6514,6 @@
 				A5573ECF2B317BFF00D98EC0 /* Products */,
 				4758815B24BAF3CAA24EC6A8 /* Pods */,
 				8D4DE9CA401A76BB1ECBE46E /* Frameworks */,
-				04E86E212B81E9FA00A35F4B /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHGCPreviewControllerHoldViewController.swift

@@ -31,7 +31,7 @@ class YHGCPreviewControllerHoldViewController: UIViewController {
         if productType == 1 { // 高才A
             return ["主申请人信息","家庭成员信息","收入记录/工作经验", "基本资料"]
         }
-        return ["主申请人信息","家庭成员信息","学历/专业资格","工作经验", "基本资料"]
+        return ["主申请人信息","家庭成员信息","学历","工作经验", "基本资料"]
     }()
     
     var arrItemVCs : [YHPreviewBaseViewController] = []

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

@@ -538,7 +538,6 @@ private extension YHGCPreviewViewModel {
 //                    let tmp2 = YHPreviewQuestionAndAnswerModel(question: "入学年月：", answer:model.admission_time)
 //                    let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: model.degree_type)
                     
-                    var schoolAddressBoard = model.school_address_aboard == 1 ? "国外" : "国内"
                     var schoolCountry = model.school_address?.country ?? ""
                     var address = ""
                     if model.school_address_aboard == 1 {
@@ -547,12 +546,16 @@ private extension YHGCPreviewViewModel {
                         }
                     } else {
                         if let schoolAddress = model.school_address {
-                            if schoolAddress.area.count > 1 {
-                                address = schoolAddress.area[1]
+                            for (index, text) in schoolAddress.area.enumerated() {
+                                let text = schoolAddress.area[index]
+                                address += text
+                                if index != schoolAddress.area.count-1 {
+                                    address += ","
+                                }
                             }
                         }
                     }
-                    var classAddress = "\(schoolAddressBoard)-\(schoolCountry)/\(address)"
+                    var classAddress = "\(schoolCountry)-\(address)"
                     
                     let tmp4 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer:classAddress)
                     let arr = [tmp0, tmp1, tmp2, tmp3, tmp4]