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

@@ -131,12 +131,13 @@ class InquiryInfoController extends BaseController
         ]);
         ]);
         if ($this->request->hasFile('file')) {
         if ($this->request->hasFile('file')) {
             $path = $this->request->file('file')->getRealPath();
             $path = $this->request->file('file')->getRealPath();
-            var_dump($path);
-            die();
             $spreadsheet = IOFactory::load($path);
             $spreadsheet = IOFactory::load($path);
             $worksheet = $spreadsheet->getActiveSheet();
             $worksheet = $spreadsheet->getActiveSheet();
             $rows = $worksheet->toArray();
             $rows = $worksheet->toArray();
-            foreach ($rows as $row) {
+            foreach ($rows as $k =>$row) {
+                if($k == 0){
+                    continue;
+                }
                 // 创建模型实例并设置属性
                 // 创建模型实例并设置属性
                 $inquiryInfoLogic->ImportInquiryInfoSave($row);
                 $inquiryInfoLogic->ImportInquiryInfoSave($row);
             }
             }

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Aside\Project;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 
 
 /**
 /**
- * @remark :项目关键字关联域名表
+ * @remark :项目关键词
  * @class  :KeywordsController.php
  * @class  :KeywordsController.php
  * @author :lyh
  * @author :lyh
  * @time   :2023/7/17 9:51
  * @time   :2023/7/17 9:51
@@ -13,13 +13,13 @@ use App\Http\Controllers\Aside\BaseController;
 class KeywordsController extends BaseController
 class KeywordsController extends BaseController
 {
 {
     /**
     /**
-     * @remark :获取当前关键字列表
+     * @remark :根据关键词获取案例
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/7/17 9:52
      * @time   :2023/7/17 9:52
      */
      */
-    public function lists(){
+    public function getKeywordCase(){
 
 
     }
     }
 }
 }

+<?php
+
+namespace App\Http\Controllers\Bside\Template;
+
+use App\Http\Controllers\Bside\BaseController;
+
+/**
+ * @remark :模块相关配置
+ * @class  :ModuleTypeController.php
+ * @author :lyh
+ * @time   :2023/7/17 15:31
+ */
+class ModuleTypeController extends BaseController
+{
+    /**
+     * @remark :获取模版类型
+     * @name   :getModuleTypeList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/17 15:32
+     */
+    public function getModuleTypeList(){
+
+    }
+}

@@ -46,7 +46,6 @@ class ProofreadingLogic extends BaseLogic
                 $v['project_id'] = $this->user['project_id'];
                 $v['project_id'] = $this->user['project_id'];
                 $v['language_id'] = $this->param['language_id'];
                 $v['language_id'] = $this->param['language_id'];
                 $v['type'] = $this->param['type'];
                 $v['type'] = $this->param['type'];
-                $v['alias'] = $this->param['alias'];
                 $this->param['data'][$k] = $v;
                 $this->param['data'][$k] = $v;
             }
             }
             //新增
             //新增

@@ -12,5 +12,5 @@ use App\Models\Base;
  */
  */
 class TemplateType extends Base
 class TemplateType extends Base
 {
 {
-    protected $table = 'gl_template_type';
+    protected $table = 'gl_public_template_type';
 }
 }