Merge branch 'master' of https://gitlab.com/willamall/willamall-admin

composer.json

@@ -9,8 +9,9 @@
     "license": "MIT",
     "require": {
         "php": "^7.1.3",
+        "kalnoy/nestedset": "^5.0",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.8.*",
+        "laravel/framework": "6.*",
         "laravel/passport": "^7.3",
         "laravel/tinker": "^1.0",
         "wm/common": "dev-master",