作者 李宇航

合并分支 'master-server' 到 'master'

更新修改



查看合并请求 !882
@@ -92,6 +92,9 @@ class CountAllProject extends Command @@ -92,6 +92,9 @@ class CountAllProject extends Command
92 $v['status'] = 6; 92 $v['status'] = 6;
93 $v['category'] = '特殊推广项目'; 93 $v['category'] = '特殊推广项目';
94 } 94 }
  95 + }else{
  96 + $v['status'] = 0;
  97 + $v['category'] = $v['category'];
95 } 98 }
96 if($v['is_admin5'] == 5){ 99 if($v['is_admin5'] == 5){
97 $v['version'] = 2; 100 $v['version'] = 2;