Merge branch '091'

* 091:
  修改版本号
  修改打包版本
  修改一处 bug

galaxy/fastlane/Fastfile

@@ -17,7 +17,7 @@ platform :ios do
   youhua_branch = "youhua-dev"
   
   #打包正使用的分支
-  myPack_branch = "630-dev"
+  myPack_branch = "091"
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3740,7 +3740,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3944,7 +3944,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3990,7 +3990,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -194,7 +194,7 @@ extension YHLoginViewModel {
             guard let self = self else { return }
             printLog(json)
             if let dic = json.data as? [AnyHashable : Any] {
-                if let uid = dic["id"] as? String {
+                if let uid = dic["uid"] as? String {
                     YHLoginManager.shared.userModel?.id = uid
                     callBack?(uid)
                     return