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

Conflicts: src/main/java/net/mingsoft/cms/util/CmsParserUtil.java src/main/resources/application.yml

Merge branch '5.0.0' of https://gitee.com/mingSoft/MCMS into 5.0.0
Conflicts: src/main/java/net/mingsoft/cms/util/CmsParserUtil.java src/main/resources/application.yml
ff9987b9 · sgjj · 3daa94b1 · 18c092cd · 3daa94b1 · 3daa94b1
Commit ff9987b9 authored Jan 04, 2020 by sgjj
--- 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
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-selection-row/bootstrap-table-multiple-selection-row.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-sort/bootstrap-table-multiple-sort.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-sort/bootstrap-table-multiple-sort.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
--- a/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/natural-sorting/bootstrap-table-natural-sorting.js
+++ b/src/main/webapp/static/plugins/bootstrap-table/1.11.1/extensions/natural-sorting/bootstrap-table-natural-sorting.js