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

@@ -320,7 +320,7 @@ class FileController
             $this->path = $this->uploads['path_a'].'/'.$this->file_type[$this->param['refer']].'/'.date('Y-m');
             $this->path = $this->uploads['path_a'].'/'.$this->file_type[$this->param['refer']].'/'.date('Y-m');
         }else{
         }else{
             //B端上传
             //B端上传
-            if(!isset($this->param['upload_method'])  && $this->param['upload_method'] == 1){
+            if(isset($this->param['upload_method'])  && $this->param['upload_method'] == 1){
                 //强制上传本地配置
                 //强制上传本地配置
                 $this->upload_location = 0;
                 $this->upload_location = 0;
             }else{
             }else{

@@ -157,6 +157,7 @@ class BTemplateLogic extends BaseLogic
      */
      */
     public function getModuleType(): array
     public function getModuleType(): array
     {
     {
+        //前端会回传：products：1，news：2，blogs：3，productCategory：4
         //定义数据结构
         //定义数据结构
         $data = [
         $data = [
             "products"=>[
             "products"=>[