Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

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');

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', ''),