|
|
@@ -65,7 +65,12 @@ class UserClass extends BaseClass
|
|
|
foreach ($list as $key => $val) {
|
|
|
$shopName = $val['shopName'] ?? '';
|
|
|
$sjName = $val['merchantName'] ?? '';
|
|
|
- $list[$key]['showName'] = $sjName . ' ' . $shopName;
|
|
|
+ $default = $val['default'] ?? 0;
|
|
|
+ $showName = $sjName . ' ' . $shopName;
|
|
|
+ if ($default == 1) {
|
|
|
+ $showName = $sjName;
|
|
|
+ }
|
|
|
+ $list[$key]['showName'] = $showName;
|
|
|
}
|
|
|
}
|
|
|
return $list;
|