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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift

@@ -275,11 +275,14 @@ class YHMajorInfo: SmartCodable {
     var en_name: String = ""
     
     func getMajorName() -> String {
-        
+        var result = ""
         if !ch_name.isEmpty {
-            return ch_name
+            result += ch_name
         }
-        return en_name
+        if !en_name.isEmpty {
+            result += en_name
+        }
+        return result
     }
     
     required init() {

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -19,6 +19,7 @@ enum YHMessageType: Int {
     case identityApproved = 6 // 身份获批
     case goToHK = 7 // 赴港办证
     case renewal = 8 // 身份续签
+    case business = 9 // 商务
     
     case yinheManager = 9527 // 银河管家
 }

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_business.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Message_shangwu@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Message_shangwu@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}