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/themes/bootstrap/dialog.css
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/dialog.css
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/easyui.css
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/easyui.css
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/filebox.css
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/filebox.css
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/accordion_arrows.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/accordion_arrows.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/blank.gif
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/blank.gif
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/calendar_arrows.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/calendar_arrows.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/combo_arrow.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/combo_arrow.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/datagrid_icons.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/datagrid_icons.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/datebox_arrow.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/datebox_arrow.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/layout_arrows.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/layout_arrows.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/linkbutton_bg.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/linkbutton_bg.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/loading.gif
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/loading.gif
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/menu_arrows.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/menu_arrows.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/messager_icons.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/messager_icons.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/pagination_icons.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/pagination_icons.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/panel_tools.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/panel_tools.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/searchbox_button.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/searchbox_button.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/slider_handle.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/slider_handle.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/spinner_arrows.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/spinner_arrows.png
--- a/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/tabs_icons.png
+++ b/src/main/webapp/static/plugins/jquery.easyui/1.4.3/themes/bootstrap/images/tabs_icons.png