merge

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;
             }
         }