// 学历预览

galaxy/Gemfile.lock

@@ -168,7 +168,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-pgyer (0.2.9)
     fastlane-plugin-upload_to_bugly (0.1.2)
-    fastlane-plugin-versioning (0.6.0)
+    fastlane-plugin-versioning (0.7.0)
     ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)

galaxy/fastlane/Fastfile

@@ -28,9 +28,11 @@ platform :ios do
   main_branch = "main"
   davidhuang_branch = "davidhuang"
   alex_branch = "main-bugfix-alex"
+  qmas_1130_branch = "qmas-1130"
   
   #打包正使用的分支
-  myPack_branch = develop_branch
+  myPack_branch = qmas_1130_branch
+
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 

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

@@ -327,13 +327,13 @@ private extension YHPreviewViewModel {
             if let arr0 = model0.edu_list {
                 for(index,model) in arr0.enumerated() {
                     //主申请人学历
+                    let tmp5 = YHPreviewQuestionAndAnswerModel(question: "学位：", answer: model.background)
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "学校全称：", answer:model.college)
                     let tmp1 = YHPreviewQuestionAndAnswerModel(question: "授课形式：", answer:model.type)
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "入学年月：", answer:model.admission_time)
                     let tmp3 = YHPreviewQuestionAndAnswerModel(question: "毕业年月：", answer: model.graduate_time)
                     let tmp4 = YHPreviewQuestionAndAnswerModel(question: "专业：", answer: model.professional)
-                    let tmp5 = YHPreviewQuestionAndAnswerModel(question: "学位：", answer: model.background)
-                    let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: model.degree_type)
+//                    let tmp6 = YHPreviewQuestionAndAnswerModel(question: "学位类型：", answer: model.degree_type)
                     
                     
                     var title = ""
@@ -351,7 +351,7 @@ private extension YHPreviewViewModel {
                     }
                     let tmp7 = YHPreviewQuestionAndAnswerModel(question: "上课地点：", answer:title)
                     
-                    let arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7]
+                    let arr = [tmp5,tmp0,tmp1,tmp2,tmp3,tmp4,tmp7]
                     
                     let addationIndex = arr0.count > 1 ? String(index + 1) : ""
                     let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "主申请人学历" + addationIndex, cellData0: arr)
@@ -398,9 +398,9 @@ private extension YHPreviewViewModel {
             let tmp0 = YHPreviewQuestionAndAnswerModel(question: "1、您的所有学历及资格证书的姓名及出生日期，是否与身份证完全一致？（例如：身份证上是【张四】，学位证上是【张三】，则为不同", answer: title)
             
             
-            let title2 = model0.edu_correct == 1 ? "是" : "否"
-            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、您配偶的大学毕业证和学位证上的姓名及出生日期，是否与身份证完全一致？", answer: title2)
-            let arr = [tmp0,tmp1]
+//            let title2 = model0.edu_correct == 1 ? "是" : "否"
+//            let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、您配偶的大学毕业证和学位证上的姓名及出生日期，是否与身份证完全一致？", answer: title2)
+            let arr = [tmp0]
             let model1 = YHPreviewInfoSessionModel(cellType: .questionAndAnswer, cellTitle: "学历证书姓名及出生日期正确性", cellData0: arr)
             arrDataForAcademicInfo.append(model1)
         }
@@ -1141,6 +1141,7 @@ private extension YHPreviewViewModel {
                         let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "否")
                         arr.append(tmp16)
                     }
+                    
                     let model2 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "配偶信息", cellData0: arr)
                     arrTemp.append(model2)
                 }