Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/layout/index/sidebar/sidebarItem.vue

@@ -85,7 +85,9 @@ export default {
     },
   },
   created() {},
-  mounted() {},
+  mounted() {
+    console.log(this.menu)
+  },
   computed: {
     ...mapGetters(['roles']),
     labelKey() {

src/views/warehouse/component/router/index.js

@@ -248,7 +248,7 @@ const warehouseManagementRouter = {
     {
       path: 'tranManagementWarehouseInOutTask',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/assignmenttaskManagement/tranManagementWarehouseInOutTask'),
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTask'),
       name: 'tranManagementWarehouseInOutTask',
       meta: {
         title: 'tranManagementWarehouseInOutTask',