github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 22:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
From-wh 2023-04-13 18:36:15 +08:00
commit ae3ded0d18
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/services/system/lang/LangCountryServices.php
View File

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

2
crmeb/config/app.php
View File

@ -14,7 +14,7 @@
// +----------------------------------------------------------------------
use think\facade\Env;
defined('DS') || define('DS', DIRECTORY_SEPARATOR);
return [
// 应用地址
'app_host' => Env::get('app.host', ''),