Merge remote-tracking branch 'origin/master'

app/common/repositories/store/order/StoreOrderRepository.php

@@ -5277,6 +5277,8 @@ class StoreOrderRepository extends BaseRepository
                     return $query->field('mer_id,mer_name');
                 }, 'verifyService' => function ($query) {
                     return $query->field('service_id,nickname');
+                }, 'user' => function ($query) {
+                    return $query->field('uid,phone,nickname');
                 }
             ]);
         $count = $query->where('test_order', 0)->count();