From f77e1dc4d2f63b9bd2bbe82960f6daffa41b2de5 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 13 Apr 2023 18:16:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?DS=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/config/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/config/app.php b/crmeb/config/app.php
index 8421d6758..d132a1df2 100644
--- a/crmeb/config/app.php
+++ b/crmeb/config/app.php
@@ -14,7 +14,7 @@
 // +----------------------------------------------------------------------
 
 use think\facade\Env;
-
+defined('DS') || define('DS', DIRECTORY_SEPARATOR);
 return [
     // 应用地址
     'app_host'         => Env::get('app.host', ''),

From 163a77e74637d9ea2cc3b9e42f7858315d464726 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 13 Apr 2023 18:16:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/system/lang/LangCountryServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/system/lang/LangCountryServices.php b/crmeb/app/services/system/lang/LangCountryServices.php
index d7c062f63..c53567b67 100644
--- a/crmeb/app/services/system/lang/LangCountryServices.php
+++ b/crmeb/app/services/system/lang/LangCountryServices.php
@@ -29,7 +29,7 @@ class LangCountryServices extends BaseServices
     public function LangCountryList(array $where = []): array
     {
         [$page, $limit] = $this->getPageValue();
-        $list = $this->dao->selectList($where, '*', $page, $limit, 'id desc', true)->toArray();
+        $list = $this->dao->selectList($where, '*', $page, $limit, 'id desc', [], true)->toArray();
         /** @var LangTypeServices $langTypeServices */
         $langTypeServices = app()->make(LangTypeServices::class);
         $langTypeList = $langTypeServices->getColumn([], 'language_name,file_name,id', 'id');