From bb38390a6ea70fc3f9b88138a3130c004e6a9023 Mon Sep 17 00:00:00 2001
From: guojia <445241500@qq.com>
Date: Sun, 28 Apr 2024 21:28:37 +0800
Subject: [PATCH] merge

---
 app/common/model/Merchant.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/model/Merchant.php b/app/common/model/Merchant.php
index 48632ae4..13a95954 100644
--- a/app/common/model/Merchant.php
+++ b/app/common/model/Merchant.php
@@ -79,12 +79,12 @@ class Merchant extends BaseModel
                     ->order(['sort' => 'asc', $this->getPk()])
                     ->paginate(15)->toArray();
 
-        foreach ($res as $kr => $r) {
+        foreach ($res['data'] as $kr => $r) {
             $res[$kr]['licenseImg'] = [];
             if ($r['license_img_id']) {
                 $img_ids = explode(",", $r['license_img_id']);
                 $files = UploadFile::getFileList($img_ids);
-                $res[$kr]['licenseImg'] = $files ?: null;
+                $res['data'][$kr]['licenseImg'] = $files ?: null;
             }
         }