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:
  // 家庭成员

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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -73,12 +73,10 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         item00.tips = "请输入子女姓名".local
         let item01 = YHFormDetailItem(type: .everName, isNeed: false)
         item01.value = child.usedName
-        item01.tips = "请输入曾用名".local
         item01.placeHolder = "请输入曾用名".local
         let item02 = YHFormDetailItem(type: .befourMarryFirstName, isNeed: false)
         item02.value = child.surname
         item02.placeHolder = "请输入婚前姓氏".local
-        item02.tips = "请输入婚前姓氏".local
         let item03 = YHFormDetailItem(type: .gender)
         item03.value = child.sexName()
         item03.tips = "请选择性别".local

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

@@ -169,7 +169,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
                 cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
-                
+    
                 var select = false
                 if let value = detailItem.value {
                    select = Bool(value)!

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

@@ -171,7 +171,9 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
             make.top.equalTo(contentView.snp.top).offset(16)
             make.left.equalToSuperview().offset(horizonalGap)
             make.right.equalTo(answer1Btn.snp.left).offset(-8)
+            make.height.greaterThanOrEqualTo(btnHeight)
         }
+        
         answer1Btn.snp.makeConstraints { make in
             make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
             make.right.equalTo(answer2Btn.snp.left).offset(-8)
@@ -194,17 +196,14 @@ class YHFormItemDoubleChoiceCell: UITableViewCell {
             make.left.equalToSuperview().offset(horizonalGap)
             make.right.equalToSuperview().offset(-horizonalGap)
             make.top.equalTo(titleLabel.snp.bottom)
-            make.height.equalTo(0)
-            make.bottom.equalToSuperview().offset(-16)
+            make.bottom.equalToSuperview().offset(-16).priority(.medium)
         }
         setTips("", isShow: false)
-        
     }
     
     func setTips(_ tips:String?, isShow:Bool) {
         tipsLabel.text = tips
         tipsLabel.isHidden = !isShow
-        
         var tipsHeight = 0.0
         if let tips = tips, tips.count > 0 {
             var bounds = CGRect()