From 669d3af3c2c0ae8005696477ca854dd07b290f45 Mon Sep 17 00:00:00 2001
From: 王智 <wz@bronet.cn>
Date: Tue, 27 Oct 2020 14:14:23 +0800
Subject: [PATCH] 接口

---
 application/api/controller/Index.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php
index 601bd6c..5563b98 100644
--- a/application/api/controller/Index.php
+++ b/application/api/controller/Index.php
@@ -402,11 +402,17 @@ class Index extends Api
             }
         }
         foreach ($shangwu1 as $key => $vo) {
-            $up[] = array_merge($vo, $shangwu2[$key]);
+            $up1[] = array_merge($vo, $shangwu2[$key]);
         }
         foreach ($shangwu3 as $key => $vo) {
-            $up = array_merge($vo, $shangwu4[$key]);
+            $up2[] = array_merge($vo, $shangwu4[$key]);
         }
+        foreach ($up1 as $key => $vo) {
+            $up = array_merge($vo, $up2[$key]);
+        }
+        dump($up1);
+        dump($up2);
+        dump($up);
 //        foreach ($shangwu4 as $key => $vo) {
 //            $up[] = array_merge($vo, $shangwu4[$key]);
 //        }
--
libgit2 0.24.0