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/jBox/0.3.2/audio/boop1.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop1.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop2.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.mp3
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.mp3
--- a/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.ogg
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/audio/boop3.ogg
--- a/src/main/webapp/static/plugins/jBox/0.3.2/jBox.css
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/jBox.css
--- a/src/main/webapp/static/plugins/jBox/0.3.2/jBox.js
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/jBox.js
--- a/src/main/webapp/static/plugins/jBox/0.3.2/jBox.min.js
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/jBox.min.js
--- a/src/main/webapp/static/plugins/jBox/0.3.2/themes/ModalBorder.css
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/themes/ModalBorder.css
--- a/src/main/webapp/static/plugins/jBox/0.3.2/themes/NoticeBorder.css
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/themes/NoticeBorder.css
--- a/src/main/webapp/static/plugins/jBox/0.3.2/themes/TooltipBorder.css
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/themes/TooltipBorder.css
--- a/src/main/webapp/static/plugins/jBox/0.3.2/themes/TooltipDark.css
+++ b/src/main/webapp/static/plugins/jBox/0.3.2/themes/TooltipDark.css
--- a/src/main/webapp/static/plugins/jquery.cookie/2.2.0/jquery.cookie.js
+++ b/src/main/webapp/static/plugins/jquery.cookie/2.2.0/jquery.cookie.js
--- a/src/main/webapp/static/plugins/jquery.cookie/2.2.1/jquery.cookie.js
+++ b/src/main/webapp/static/plugins/jquery.cookie/2.2.1/jquery.cookie.js
--- a/src/main/webapp/static/plugins/jquery.daterangepicker/1.3.4/daterangepicker.css
+++ b/src/main/webapp/static/plugins/jquery.daterangepicker/1.3.4/daterangepicker.css
--- a/src/main/webapp/static/plugins/jquery.daterangepicker/1.3.4/daterangepicker.js
+++ b/src/main/webapp/static/plugins/jquery.daterangepicker/1.3.4/daterangepicker.js
--- a/src/main/webapp/static/plugins/jquery.daterangepicker/1.3.4/moment.js
+++ b/src/main/webapp/static/plugins/jquery.daterangepicker/1.3.4/moment.js
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/changelog.txt
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/changelog.txt
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/datagrid-detailview.js
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/datagrid-detailview.js
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/datagrid-scrollview.js
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/datagrid-scrollview.js