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

@@ -69,7 +69,7 @@ class TemplateLog extends Command
         $templateLogModel->del(['created_at'=>['<=',$date],'source'=>['!=',1]]);
         $templateLogModel->del(['created_at'=>['<=',$date],'source'=>['!=',1]]);
         //首页保存最新的20条记录
         //首页保存最新的20条记录
         $latestIds = $templateLogModel->where(['source'=>1,'is_custom'=>0])->orderBy('created_at', 'desc')->take(20)->pluck('id'); // 仅提取ID字段
         $latestIds = $templateLogModel->where(['source'=>1,'is_custom'=>0])->orderBy('created_at', 'desc')->take(20)->pluck('id'); // 仅提取ID字段
-        return $templateLogModel->del(['id'=>['not in',$latestIds],'source'=>1,'is_custom'=>0]);
+        return $templateLogModel->del(['id'=>['not in',$latestIds],'source'=>1,'is_custom'=>0,'is_list'=>0]);
     }
     }
 
 
     /**
     /**

@@ -170,6 +170,7 @@ class OptimizeController extends BaseController
             'gl_project.is_remain_today AS is_remain_today',
             'gl_project.is_remain_today AS is_remain_today',
             'gl_project.remain_day AS remain_day',
             'gl_project.remain_day AS remain_day',
             'gl_project.robots AS robots',
             'gl_project.robots AS robots',
+            'gl_project.is_minor_languages AS is_minor_languages',
             'gl_project.is_translate AS is_translate',
             'gl_project.is_translate AS is_translate',
             'gl_project.is_translate_tag AS is_translate_tag',
             'gl_project.is_translate_tag AS is_translate_tag',
             'gl_project.is_upgrade AS is_upgrade',
             'gl_project.is_upgrade AS is_upgrade',