Merge branch 'master' of https://gitlab.ezijing.com/webapp/finance-admin

# Conflicts: # src/components/base/AppList.vue # src/components/layout/Main.vue

Merge branch 'master' of https://gitlab.ezijing.com/webapp/finance-admin
68e8aad1 · lihuihui · f0b526a7 · 71852390 · 68e8aad1 · 68e8aad1
--- a/src/assets/theme/index.css
+++ b/src/assets/theme/index.css
--- a/src/components/base/AppList.vue
+++ b/src/components/base/AppList.vue
--- a/src/components/layout/Main.vue
+++ b/src/components/layout/Main.vue
--- a/src/modules/channel/api.js
+++ b/src/modules/channel/api.js
--- a/src/modules/channel/views/List.vue
+++ b/src/modules/channel/views/List.vue
--- a/src/utils/axios.js
+++ b/src/utils/axios.js