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.xcodeproj/project.pbxproj

@@ -746,6 +746,45 @@
 			path = PickerView;
 			sourceTree = "<group>";
 		};
+		04594FCF2B9EEEEC00C34B15 /* MyCertificates(我的证书) */ = {
+			isa = PBXGroup;
+			children = (
+				04594FD32B9EEF5100C34B15 /* M */,
+				04594FD22B9EEF2900C34B15 /* VM */,
+				04594FD12B9EEF1700C34B15 /* V */,
+				04594FD02B9EEF1000C34B15 /* C */,
+			);
+			path = "MyCertificates(我的证书)";
+			sourceTree = "<group>";
+		};
+		04594FD02B9EEF1000C34B15 /* C */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		04594FD12B9EEF1700C34B15 /* V */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		04594FD22B9EEF2900C34B15 /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
+		04594FD32B9EEF5100C34B15 /* M */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
 		0468D4292B55017400CFB916 /* Analytics */ = {
 			isa = PBXGroup;
 			children = (
@@ -1697,6 +1736,7 @@
 		A5C382C82B5E101E00C5E65C /* ServiceProcess(流程) */ = {
 			isa = PBXGroup;
 			children = (
+				04594FCF2B9EEEEC00C34B15 /* MyCertificates(我的证书) */,
 				047294F62B9B0C5D008E0B84 /* MyDocuments(我的文书) */,
 				047294F22B9B0C49008E0B84 /* MySignature(我的签字) */,
 				04E86E222B81EA1000A35F4B /* WorkExperience(工作经验) */,

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

@@ -665,12 +665,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         if isLiveOverseaYear != 1 && isLiveOverseaYear != 2 { // 默认在海外未居住满一年以上
             isLiveOverseaYear = 2
         }
-        
-        if sex != 1 && sex != 2 { // 默认为男性
-            sex = 1
-        }
-        
-                
+    
         return self
     }