Merge remote-tracking branch 'origin/master'

b21bd89a · zhongyh · ad922088 · 3932bb6b · b21bd89a · b21bd89a
Commit b21bd89a authored Dec 17, 2019 by zhongyh
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.js
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.js
--- a/src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json
+++ b/src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json
--- a/src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.svg
+++ b/src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.svg
--- a/src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.ttf
+++ b/src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.ttf
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff2
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff2
--- a/src/main/webapp/static/ms-admin/4.7.2/images/default_handsome.jpg
+++ b/src/main/webapp/static/ms-admin/4.7.2/images/default_handsome.jpg
--- a/src/main/webapp/static/ms-admin/4.7.2/images/login-bg.jpg
+++ b/src/main/webapp/static/ms-admin/4.7.2/images/login-bg.jpg
--- a/src/main/webapp/static/ms-admin/4.7.2/images/login-slogn.png
+++ b/src/main/webapp/static/ms-admin/4.7.2/images/login-slogn.png
--- a/src/main/webapp/static/ms-admin/4.7.2/images/logo.png
+++ b/src/main/webapp/static/ms-admin/4.7.2/images/logo.png
--- a/src/main/webapp/static/ms-admin/4.7.2/images/version.png
+++ b/src/main/webapp/static/ms-admin/4.7.2/images/version.png
--- a/src/main/webapp/static/ms-admin/4.7.2/js/ms.upload.js
+++ b/src/main/webapp/static/ms-admin/4.7.2/js/ms.upload.js