Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -481,7 +481,7 @@ class ProjectUpdate extends Command
             return $task_id;
             return $task_id;
         }
         }
 
 
-        $task_list = UpdateLog::where('project_id', 543)->where('status', UpdateLog::STATUS_UN)->orderBy('project_id', 'asc')->orderBy('sort', 'asc')->limit(8)->get();
+        $task_list = UpdateLog::where('status', UpdateLog::STATUS_UN)->orderBy('project_id', 'asc')->orderBy('sort', 'asc')->limit(8)->get();
         if ($task_list->count() == 0) {
         if ($task_list->count() == 0) {
             return false;
             return false;
         }
         }

@@ -167,6 +167,7 @@ class UserLoginLogic
         $info['is_upload_manage'] = $project['is_upload_manage'];
         $info['is_upload_manage'] = $project['is_upload_manage'];
         $info['upload_config'] = $project['upload_config'];
         $info['upload_config'] = $project['upload_config'];
         $info['image_max'] = $project['image_max'];
         $info['image_max'] = $project['image_max'];
+        $info['is_update_language'] = $project['is_update_language'];
         $info['configuration'] = $project['deploy_build']['configuration'];
         $info['configuration'] = $project['deploy_build']['configuration'];
         if($info['is_customized'] == 1){
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
             $info['is_visualization'] = json_decode($project['is_visualization']);