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(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift

@@ -134,7 +134,7 @@ class YHFamilyMemberInfoModel: SmartCodable {
         } else if self.birthPlaceAboardHistory == "1" {
             return "国外"
         }
-        return "未知"
+        return ""
     }
     
     private func getMarriageStatus(_ marrage: String) -> String {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift

@@ -230,7 +230,7 @@ extension YHFamilyInfoConfirmViewModel {
                                                 previousTitle: "原婚姻状况",
                                                 previousValue: model.info.getHistoryMarriageState(),
                                                 isEditMode: isEditMode,
-                                                isShowPreviousInfo: !isEditMode && !model.info.marriedHistory.isEmpty)
+                                                isShowPreviousInfo: !isEditMode && !model.info.getHistoryMarriageState().isEmpty)
             resultArr.append(marriageInfo)
         }
         
@@ -249,7 +249,7 @@ extension YHFamilyInfoConfirmViewModel {
                                                  previousValue: historyBirthNation,
                                                  options: options,
                                                  isEditMode: isEditMode,
-                                                 isShowPreviousInfo: !isEditMode && !birthNation.isEmpty)
+                                                 isShowPreviousInfo: !isEditMode && !historyBirthNation.isEmpty)
         resultArr.append(birthNationInfo)
         
         // 出生地