Merge branch 'feature/zjx2' into 'develop'

auto commit See merge request !6

Merge branch 'feature/zjx2' into 'develop'
auto commit See merge request !6
b216b855 · 张敬贤 · 77ac01e6 · b6b31aa7 · b216b855 · b216b855
--- a/src/components/loading.js
+++ b/src/components/loading.js
--- a/src/components/loading.vue
+++ b/src/components/loading.vue