Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  布局修改
  职位水平类别特殊处理

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHSearchItemLayout.swift

@@ -33,7 +33,7 @@ class YHSearchItemLayout: UICollectionViewFlowLayout {
                 let originX = prevLayout.frame.maxX
                 //如果当 （上一个cell的最右边X + 我们想要的间距 + 当前cell的宽度 + 区边距） 依然在contentSize中 (小于屏幕宽度)，我们改变当前cell的原点位置
                 //判断 当前cell的 maxX 是否超出屏幕
-                if((CGFloat(originX) + CGFloat(maximumSpacing) + currentLayout.frame.size.width) + self.sectionInset.right < self.collectionViewContentSize.width)  {
+                if((CGFloat(originX) + CGFloat(maximumSpacing) + currentLayout.frame.size.width) + self.sectionInset.right <= self.collectionViewContentSize.width)  {
                     var frame = currentLayout.frame
                     frame.origin.x = CGFloat(originX) + CGFloat(maximumSpacing)
                     currentLayout.frame = frame

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -207,7 +207,7 @@ class YHWorkExperienceItemView: UIView {
         }
         messageTextField.placeholder = dataSource.prompts
         messageTextField.text = dataSource.message
-        if dataSource.message == "0" && dataSource.id == .id15 {
+        if dataSource.message == "0" && (dataSource.id == .id15 || dataSource.id == .id19) {
             messageTextField.text = ""
         }
         showPromptLabel.text = dataSource.alertMessage