// 家庭信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -481,8 +481,8 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                         // 前两行是 学历学位信息标题 和 是否拥有学位
                         cell.showDeleteBtn(indexPath.row > 2)
                         
-                        if let degree = degreeInfo.degree {
-                            if let degreeIndex = Int(degree), let subType = YHPickerViewDegreeType(rawValue: degreeIndex) {
+                        if !degreeInfo.degree.isEmpty {
+                            if let degreeIndex = Int(degreeInfo.degree), let subType = YHPickerViewDegreeType(rawValue: degreeIndex) {
                                 cell.degree = YHFormPickerViewSubType.degree(subType).title
                             } else {
                                 cell.degree = ""
@@ -490,8 +490,8 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                         } else {
                             cell.degree = ""
                         }
-                        if let address = degreeInfo.address {
-                            if let addressIndex = Int(address), let subType = YHPickerViewDegreeLocationType(rawValue: addressIndex) {
+                        if !degreeInfo.address.isEmpty {
+                            if let addressIndex = Int(degreeInfo.address), let subType = YHPickerViewDegreeLocationType(rawValue: addressIndex) {
                                 cell.degreePlace = YHFormPickerViewSubType.degreeLocation(subType).title
                             } else {
                                 cell.degreePlace = ""

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

@@ -1280,9 +1280,8 @@ class YHCNIdentityCard: SmartCodable {
 // MARK: - YHHasDegreeJson
 class YHHasDegreeJson: SmartCodable {
     
-    
-    var degree: String?
-    var address: String?
+    var degree: String = ""
+    var address: String = ""
 
     enum CodingKeys: String, CodingKey {
         case degree = "degree"