Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0

# Conflicts: # src/main/webapp/WEB-INF/manager/include/head-file.ftl

Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0
# Conflicts: # src/main/webapp/WEB-INF/manager/include/head-file.ftl
06d94a95 · yinxr · 6e454be2 · f5aa9b5d · 06d94a95 · 06d94a95
Commit 06d94a95 authored Jan 29, 2019 by yinxr
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/dialog/basic.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/dialog/basic.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/dialog/message.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/dialog/message.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/form/basic.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/form/basic.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/login1.jpg
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/login1.jpg
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/modem.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/modem.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/more.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/more.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/pda.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/pda.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/scanner.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/scanner.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/tablet.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/images/tablet.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/input/numberspinner.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/input/numberspinner.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/input/textbox.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/input/textbox.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/layout/basic.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/layout/basic.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/menu/basic.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/menu/basic.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/menu/menubar.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/menu/menubar.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/_content.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/_content.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/ajax.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/ajax.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/basic.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/basic.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/nav.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/panel/nav.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/simplelist/basic.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/simplelist/basic.html
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/simplelist/button.html
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/demo-mobile/simplelist/button.html