Merge branch 'dev-en' of http://192.168.0.203:8080/gitbucket/git/root/IRIS_FORNT_TEMPERATURE into dev-en
commit f562de89717fb556afee0610f8455071ac828202
2 parents c839c23 + acdc818
zhangyingjie authored on 13 Apr 2020
Showing 6 changed files
View
src/router/modules/base.js
View
src/views/layout/components/TagsView/index.vue
View
src/views/memberManage/addPerson.vue
View
src/views/memberManage/addPersonIris.vue
View
src/views/system/user/editUser.vue
View
src/views/system/user/listUser.vue