mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#36) from dev into preview

Browse Source 
Reviewed-on: #36
This commit is contained in:
mkm 2023-10-13 20:11:27 +08:00
commit bc4199a566
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/system/merchant/MerchantTypeRepository.php
View File

@ -73,7 +73,7 @@ class MerchantTypeRepository extends BaseRepository
$merTypeIds = $queryBuilder->fetchSql(false)->column('mer_type_id'); $merTypeIds = $queryBuilder->fetchSql(false)->column('mer_type_id');
$query = MerchantType::getDB()->when(!$getAll, function ($query) use ($merTypeIds) { $query = MerchantType::getDB()->when(!$getAll, function ($query) use ($merTypeIds) {
$query->whereIn('mer_type_id', $merTypeIds); $query->whereIn('mer_type_id', $merTypeIds);
})->field('mer_type_id,type_name'); })->field('mer_type_id,type_name,type_code');
return $query->select()->toArray(); return $query->select()->toArray();
} }