Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # public/config.json
Showing
60 changed files
with
1632 additions
and
676 deletions
src/image/bdcqz/bdczm.jpg
0 → 100644
592 KB
src/utils/dictionary.js
0 → 100644
src/utils/rule.js
deleted
100644 → 0
src/utils/util.cookies.js
0 → 100644
src/utils/util.js
0 → 100644
src/views/login/images/close.svg
0 → 100644
src/views/login/images/login-bg.png
0 → 100644
1.45 MB
src/views/login/images/logo-login.png
0 → 100644
16.7 KB
src/views/login/images/open.svg
0 → 100644
src/views/login/images/password.svg
0 → 100644
src/views/login/images/user.svg
0 → 100644
src/views/login/index.vue
0 → 100644
src/views/workflow/components/tdytTable.vue
0 → 100644
-
Please register or sign in to post a comment