Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

7 天以前 97fba4a0e38c0b8455d43d2935aa996676407361

 north-glass-erp/northglass-erp/src/router/index.js

@@ -83,6 +83,23 @@
            }
          ]
        },
        {
          path:'userLog',
          name: 'userLog',
          component: () => import('../views/system/userLog/UserLog.vue'),
          children:[
            {
              path: 'userListLog',
              name: 'userListLog',
              component: () => import('../views/system/userLog/UserListLog.vue'),
            },
            {
              name:'userLog',
              path: '',
              redirect:'/main/userLog/userListLog'
            }
          ]
        },

        {
          path:'glassPrice',