Merge branch 'zengjun' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/api/thirdPart/weight/WeightBaseController.php

app/Services/CacheShelfService.php

@@ -205,9 +205,8 @@ class   CacheShelfService
                 "uomDesc02" => "uo"
             ],
         ];
-        return new MaterialBox(['code' => 200]);
-//        $response = Http::post(config('api.haiq.storage.light'), $params);
-//        return json_decode($response->body());
+        $response = Http::post(config('api.haiq.storage.light'), $params);
+        return json_decode($response->body());
     }
 
     /**