接口

@@ -371,8 +371,6 @@ class Index extends Api
             ->join('planename p', 'p.id=s.plane_type')
             ->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
             ->select();
-        dump($shangwu3);
-        die;
         foreach ($shangwu3 as $k => $v) {
             if ($v['fuser_id'] != null) {
                 $user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
@@ -404,18 +402,11 @@ class Index extends Api
             }
         }
         foreach ($shangwu1 as $key => $vo) {
-            $up1[] = array_merge($vo, $shangwu2[$key]);
+            $up = array_merge($vo, $shangwu2[$key]);
         }
-        dump($up1);
         foreach ($shangwu3 as $key => $vo) {
-            $up2[] = array_merge($vo, $shangwu4[$key]);
+            $up = array_merge($vo, $shangwu4[$key]);
         }
-        dump($up2);
-        foreach ($up1 as $key => $vo) {
-            $up = array_merge($vo, $up2[$key]);
-        }
-        dump($up);
-        die;
 //        foreach ($shangwu4 as $key => $vo) {
 //            $up[] = array_merge($vo, $shangwu4[$key]);
 //        }