xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-09-18 15:04:59 +08:00
parent 9331aa2f36 e2f2e0147e
commit cd29507c45
23 changed files with 933 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/logic/BrandLogic.php
+1 -1
View File
@@ -16,7 +16,7 @@ class BrandLogic
public function getList()
{
return Brand::where('status', 1)->orderBy('sort','desc')->get(['id', 'brand_code', 'brand_name', 'logo', 'description']);
return Brand::where('status', 1)->orderBy('hot','desc')->orderBy('sort','desc')->get(['id', 'brand_code', 'brand_name', 'logo', 'description']);
}
}
app/common/logic/SysAccountLogic.php
+1 -1
View File
@@ -16,7 +16,7 @@ class SysAccountLogic
public function getList()
{
return SysAccount::where('status', 1)->orderBy('sort','desc')->get(['id', 'account_name', 'currency_id', 'account_number', 'bank_name', 'bank_branch', 'description']);
return SysAccount::where('status', 1)->orderBy('sort','desc')->get(['id', 'account_name', 'currency_id', 'account_number', 'bank_name', 'bank_branch', 'description', 'short_desc']);
}
}
app/common/logic/SysPortLogic.php
+1 -1
View File
@@ -16,7 +16,7 @@ class SysPortLogic
public function getList($where)
{
return SysPort::where('status', 1)->where($where)->orderBy('sort','desc')->get(['id', 'port_code', 'port_name', 'country_id', 'description']);
return SysPort::where('status', 1)->where($where)->orderBy('sort','desc')->get(['id', 'port_code', 'port_name', 'port_name_en', 'country_id', 'description']);
}
}