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/locale/bootstrap-table-tr-TR.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-tr-TR.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-tr-TR.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-tr-TR.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uk-UA.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uk-UA.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uk-UA.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uk-UA.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-ur-PK.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-ur-PK.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-ur-PK.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-ur-PK.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uz-Latn-UZ.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uz-Latn-UZ.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uz-Latn-UZ.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-uz-Latn-UZ.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-vi-VN.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-vi-VN.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-vi-VN.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-vi-VN.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-TW.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-TW.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-TW.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/locale/bootstrap-table-zh-TW.min.js
--- a/src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/daterangepicker.css
+++ b/src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/daterangepicker.css
--- a/src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/daterangepicker.js
+++ b/src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/daterangepicker.js
--- a/src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/moment.js
+++ b/src/main/webapp/static/plugins/bootstrap.daterangepicker/1.3.4/moment.js
--- a/src/main/webapp/static/plugins/bootstrap.select2/3.5.2/select2-spinner.gif
+++ b/src/main/webapp/static/plugins/bootstrap.select2/3.5.2/select2-spinner.gif
--- a/src/main/webapp/static/plugins/bootstrap.select2/3.5.2/select2.css
+++ b/src/main/webapp/static/plugins/bootstrap.select2/3.5.2/select2.css
--- a/src/main/webapp/static/plugins/bootstrap.select2/3.5.2/select2.min.js
+++ b/src/main/webapp/static/plugins/bootstrap.select2/3.5.2/select2.min.js