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

@@ -176,6 +176,9 @@ class BTemplateLogic extends BaseLogic
                 $this->fail('定制页面，请先上传代码块');
                 $this->fail('定制页面，请先上传代码块');
             }
             }
             $commonInfo = $this->getCustomizedCommonHtml($type);//获取定制头部
             $commonInfo = $this->getCustomizedCommonHtml($type);//获取定制头部
+            if($this->user['project_id'] == 655){
+                return $customHtmlInfo['main_html'];
+            }
             if($commonInfo !== false){
             if($commonInfo !== false){
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
                 $customHtmlInfo['main_html'] = $this->handleAllHtml($commonInfo,$customHtmlInfo['main_html']);
             }
             }