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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 家庭成员 证件类别

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift

@@ -210,12 +210,12 @@ class YHSheetPickerView: UIView {
              // 证件
             .certificate:
                 [YHSheetPickerViewItem(title:"护照".local, index:3),
-                 YHSheetPickerViewItem(title:"旅游通行证".local, index:4),
-                 YHSheetPickerViewItem(title:"外交护照".local, index:5),
+                 YHSheetPickerViewItem(title:"外交护照".local, index:4),
+                 YHSheetPickerViewItem(title:"公务护照".local, index:5),
                  YHSheetPickerViewItem(title:"中国发无国籍旅游证件".local, index:6),
-                 YHSheetPickerViewItem(title:"其他无国籍旅行证件".local, index:7),
+                 YHSheetPickerViewItem(title:"旅游通行证".local, index:7),
                  YHSheetPickerViewItem(title:"联合国通行证".local, index:8),
-                 YHSheetPickerViewItem(title:"公务护照".local, index:9),
+                 YHSheetPickerViewItem(title:"其他无国籍旅行证件".local, index:9),
                  YHSheetPickerViewItem(title:"其他".local, index:10),
                 ],
             
@@ -236,8 +236,8 @@ class YHSheetPickerView: UIView {
                 
             // 学位颁发地区
             .degreeLocation:
-                [YHSheetPickerViewItem(title:"国内 (颁发)".local, index:1),
-                 YHSheetPickerViewItem(title:"国外 (颁发)".local, index:2),
+                [YHSheetPickerViewItem(title:"国内 (颁发)".local, index:0),
+                 YHSheetPickerViewItem(title:"国外 (颁发)".local, index:1),
                 ],
     
             // 专业证书
@@ -269,8 +269,9 @@ class YHSheetPickerView: UIView {
                  YHSheetPickerViewItem(title:"法律".local, index:6),
                  YHSheetPickerViewItem(title:"生命科学及医学".local, index:7),
                  YHSheetPickerViewItem(title:"管理学".local, index:8),
-                 YHSheetPickerViewItem(title:"社会科学".local, index:9),
-                 YHSheetPickerViewItem(title:"其他".local, index:10),
+                 YHSheetPickerViewItem(title:"理学".local, index:9),
+                 YHSheetPickerViewItem(title:"社会科学".local, index:10),
+                 YHSheetPickerViewItem(title:"其他".local, index:11),
                 ],
         ]