Skip to content

G
galaxy-iOS
Commit dbc2e003 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

解决冲突

parent 1e8d38f2
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift
View file @ dbc2e003
...@@ -663,13 +663,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol { ...@@ -663,13 +663,6 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
if follow != 1 && follow != 2 { // 默认随行 if follow != 1 && follow != 2 { // 默认随行
follow = 1 follow = 1
<<<<<<< HEAD
=======
}
// 父母和兄弟姐妹无随行配置
if self.relationType == .father || self.relationType == .mother || self.relationType == .brother {
follow = 0
>>>>>>> 630-dev
} }
// 父母和兄弟姐妹无随行配置 // 父母和兄弟姐妹无随行配置
if self.relationType == .father || self.relationType == .mother || self.relationType == .brother { if self.relationType == .father || self.relationType == .mother || self.relationType == .brother {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment