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/bootstrap-table/1.11.1/extensions/flat-json/bootstrap-table-flat-json.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/flat-json/bootstrap-table-flat-json.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/flat-json/bootstrap-table-flat-json.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/flat-json/bootstrap-table-flat-json.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by-v2/bootstrap-table-group-by.css
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by-v2/bootstrap-table-group-by.css
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by-v2/bootstrap-table-group-by.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by-v2/bootstrap-table-group-by.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by-v2/bootstrap-table-group-by.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by-v2/bootstrap-table-group-by.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by/bootstrap-table-group-by.css
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by/bootstrap-table-group-by.css
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by/bootstrap-table-group-by.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by/bootstrap-table-group-by.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by/bootstrap-table-group-by.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/group-by/bootstrap-table-group-by.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/key-events/bootstrap-table-key-events.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/key-events/bootstrap-table-key-events.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/key-events/bootstrap-table-key-events.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/key-events/bootstrap-table-key-events.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/mobile/bootstrap-table-mobile.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/mobile/bootstrap-table-mobile.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/mobile/bootstrap-table-mobile.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/mobile/bootstrap-table-mobile.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multi-column-toggle/bootstrap-table-multi-toggle.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multi-column-toggle/bootstrap-table-multi-toggle.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multi-column-toggle/bootstrap-table-multi-toggle.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-search/bootstrap-table-multiple-search.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-search/bootstrap-table-multiple-search.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-search/bootstrap-table-multiple-search.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-search/bootstrap-table-multiple-search.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.css
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.js