Merge branch 'master' of github.com:hainatravel/information-system

application/config/config.php

@@ -410,7 +410,7 @@ $config['site'] = array(
     'pgr' => array('site_code' => 'pgr', 'site_id' => 148, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.peregrine.cn', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
     'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')),
     'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.beijinghighlights.com', 'site_authors' => array('cj')),
-    'trippest' => array('site_code' => 'trippest', 'site_id' => 145, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.trippest.com', 'site_authors' => array('cj'))
+    'trippest' => array('site_code' => 'trippest', 'site_id' => 145, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.trippest.com', 'site_authors' => array('cj'),'site_user' => array(',ycc,zp,'))
 );
 
 //静态文件生成路径
@@ -682,7 +682,7 @@ $config['project_state'] = array(
 //是否开启权限控制
 $config['check_access'] = TRUE;
 //权限管理超级管理
-$config['access_super_manage'] = array('ycc', 'lmr', 'lyj','cyc');
+$config['access_super_manage'] = array('ycc', 'lmr', 'lyj','cyc','zp');
 
 //编辑器预览样式路径
 $config['css_source_cht'] = 'https://data.chinahighlights.com/css/min.php?f=/public/css/global.min.css,/css/festival-detail.css';