|
@@ -5045,7 +5045,7 @@ class StoreOrderRepository extends BaseRepository
|
|
5045
|
if ($merId) $whre['mer_id'] = $merId;
|
5045
|
if ($merId) $whre['mer_id'] = $merId;
|
|
5046
|
$data = $this->dao->getWhere($where, '*', [
|
5046
|
$data = $this->dao->getWhere($where, '*', [
|
|
5047
|
'user' => function ($query) {
|
5047
|
'user' => function ($query) {
|
|
5048
|
- $query->field('uid,real_name,nickname');
|
|
|
|
|
|
5048
|
+ $query->field('uid,account,real_name,nickname');
|
|
5049
|
}, 'StoreRefundOrder' => function ($query) {
|
5049
|
}, 'StoreRefundOrder' => function ($query) {
|
|
5050
|
return $query->field('*');
|
5050
|
return $query->field('*');
|
|
5051
|
}, 'pickUp','takeStatus'
|
5051
|
}, 'pickUp','takeStatus'
|