Merge remote-tracking branch 'origin/5.2'

# Conflicts: # doc/mcms-5.1.sql # pom.xml

Merge remote-tracking branch 'origin/5.2'
# Conflicts: # doc/mcms-5.1.sql # pom.xml
c1b81d0d · wujj · c791bf40 · 1a95a697 · c791bf40 · c791bf40
Commit c1b81d0d authored Nov 03, 2020 by wujj
--- a/src/main/webapp/templets/1/default/images/more.png
+++ b/src/main/webapp/templets/1/default/images/more.png
--- a/src/main/webapp/templets/1/default/images/ms.ico
+++ b/src/main/webapp/templets/1/default/images/ms.ico
--- a/src/main/webapp/templets/1/default/images/new-loading.gif
+++ b/src/main/webapp/templets/1/default/images/new-loading.gif
--- a/src/main/webapp/templets/1/default/images/news.png
+++ b/src/main/webapp/templets/1/default/images/news.png
--- a/src/main/webapp/templets/1/default/images/news2.png
+++ b/src/main/webapp/templets/1/default/images/news2.png
--- a/src/main/webapp/templets/1/default/images/no-comment.png
+++ b/src/main/webapp/templets/1/default/images/no-comment.png
--- a/src/main/webapp/templets/1/default/images/no-data.png
+++ b/src/main/webapp/templets/1/default/images/no-data.png
--- a/src/main/webapp/templets/1/default/images/our_company.jpeg
+++ b/src/main/webapp/templets/1/default/images/our_company.jpeg
--- a/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
+++ b/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
--- a/src/main/webapp/templets/1/default/images/pic.png
+++ b/src/main/webapp/templets/1/default/images/pic.png
--- a/src/main/webapp/templets/1/default/images/pics.png
+++ b/src/main/webapp/templets/1/default/images/pics.png
--- a/src/main/webapp/templets/1/default/images/search.jpg
+++ b/src/main/webapp/templets/1/default/images/search.jpg
--- a/src/main/webapp/templets/1/default/images/search.png
+++ b/src/main/webapp/templets/1/default/images/search.png
--- a/src/main/webapp/templets/1/default/images/talk_online.jpeg
+++ b/src/main/webapp/templets/1/default/images/talk_online.jpeg
--- a/src/main/webapp/templets/1/default/images/timg.jpg
+++ b/src/main/webapp/templets/1/default/images/timg.jpg
--- a/src/main/webapp/templets/1/default/images/we-chat.png
+++ b/src/main/webapp/templets/1/default/images/we-chat.png
--- a/src/main/webapp/templets/1/default/images/weixin.jpg
+++ b/src/main/webapp/templets/1/default/images/weixin.jpg
--- a/src/main/webapp/templets/1/default/index.htm
+++ b/src/main/webapp/templets/1/default/index.htm
--- a/src/main/webapp/templets/1/default/js/demo.js
+++ b/src/main/webapp/templets/1/default/js/demo.js
--- a/src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js
+++ b/src/main/webapp/templets/1/default/js/jquery.sinaEmotion.js