1

app/api/controller/Category.php

@@ -47,7 +47,7 @@ class Category extends Controller
 
     public function listmerchant(): Json
     {
-        $merchantId = $this->request->param('merchantId', '');
+        $merchantId = $this->request->param('merchantId', 0);
         $model = new CategoryModel;
         $hasGoods = GoodsCategoryRel::getcategory($this->storeId,$merchantId);
 

app/api/controller/Feedback.php

@@ -74,6 +74,7 @@ class Feedback extends Controller
                 $files = UploadFile::getFileList($img_ids);
                 $list['data'][$kr]['imgs'] = $files ?: null;
             }
+            $list['data'][$kr]['deal_time'] = !empty($r['deal_time']) ? Date("Y-m-d H:i:s", $r['deal_time']) : '';
         }
         return $this->renderSuccess($list);
     }