Merge remote-tracking branch 'origin/master'

kongdeqiang

2 天以前 66cea4479288064e1e50ee8c0c1d5b38526c67bb

 src/store/state.js

@@ -145,13 +145,13 @@
          children:[
            {
              icon: 'el-icon-user-solid',
              name: '巡检登记',
              name: '巡检记录管理',
              parentId: 4,
              indexUrl: 'inspectionRegistration'
            },
            {
              icon: 'el-icon-user-solid',
              name: '维修维护管理软件',
              name: '维修维护管理',
              parentId: 4,
              indexUrl: 'repairAndMaintenance'
            },