Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev

2024-03-09 16:39:49 +08:00 · 2024-03-09 16:39:49 +08:00 · 2b56e360df
commit 2b56e360df
parent 879e56c3a5 2cc737cd20
1 changed files with 3 additions and 0 deletions
--- a/app/common/repositories/store/order/StoreOtherOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOtherOrderRepository.php
@ -1084,6 +1084,9 @@ class StoreOtherOrderRepository extends BaseRepository
                'spread' => function ($query) {
                    $query->field('uid,nickname,avatar');
                },
+                'merchant' => function ($query) {
+                    $query->field('mer_id,mer_name');
+                },
            ]
        );
        if (!$res) throw new ValidateException('数据不存在');