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

@@ -165,6 +165,9 @@ class ProductController extends BaseController
         if(isset($this->map['status'])){
         if(isset($this->map['status'])){
             $query = $query->where('status',$this->map['status']);
             $query = $query->where('status',$this->map['status']);
         }
         }
+        if(isset($this->map['created_uid'])){
+            $query = $query->where('created_uid',$this->map['created_uid']);
+        }
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
         if(!empty($this->param['start_at']) && !empty($this->param['end_at'])){
             $query->where('created_at', '>=' ,$this->param['start_at'].' 00:00:00')->where('created_at', '<=' ,$this->param['end_at'].' 59:59:59');
             $query->where('created_at', '>=' ,$this->param['start_at'].' 00:00:00')->where('created_at', '<=' ,$this->param['end_at'].' 59:59:59');
         }
         }

@@ -27,4 +27,5 @@ class LanguageController extends BaseController
         $lists = $webLanguageModel->list();
         $lists = $webLanguageModel->list();
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
 }
 }

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Bside\Setting\ProjectCountryLogic;
 use App\Http\Logic\Bside\Setting\ProjectCountryLogic;
+use App\Models\WebSetting\LanguageTxt;
 
 
 /**
 /**
  * @name:项目配置多语言设置
  * @name:项目配置多语言设置
@@ -88,4 +89,24 @@ class ProjectCountryController extends BaseController
         $info = $projectCountryLogic->country_custom_info();
         $info = $projectCountryLogic->country_custom_info();
         $this->response('success',Code::SUCCESS,$info);
         $this->response('success',Code::SUCCESS,$info);
     }
     }
+
+    /**
+     * @remark :获取文本信息
+     * @name   :getLanguageTxt
+     * @author :lyh
+     * @method :post
+     * @time   :2024/8/5 17:29
+     */
+    public function getLanguageTxt(){
+        $languageTxtModel = new LanguageTxt();
+        $data = $languageTxtModel->list();
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+
+    public function saveLanguageTxt(){
+        $languageTxtModel = new LanguageTxt();
+        $data = $languageTxtModel->list();
+        $this->response('success',Code::SUCCESS,$data);
+    }
 }
 }

+<?php
+/**
+ * @remark :
+ * @name   :LanguageTxt.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/8/5 17:36
+ */
+
+namespace App\Models\WebSetting;
+
+use App\Models\Base;
+
+class LanguageTxt extends Base
+{
+    protected $table = 'gl_language_txt';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+
+}