Merge remote-tracking branch 'remotes/origin/developer' into developerA

# Conflicts:
#	src/main/resources/templates/components/footer.html

src/main/resources/templates/article/components/article-footer.html

@@ -4,7 +4,7 @@
         <div class="logo"><img src="/img/info/foot-logo.png" /></div>
         <div class="dizhi">
             <p>Copyright©2015-2020 CAIMEI365.com All Rights Reserved.</p>
-            <p>深圳市采美信息技术有限公司版权所有粤ICP备14019824号</p>
+            <p>深圳市采美信息技术有限公司版权所有<a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号-1</a></p>
         </div>
     </div>
 </div>

src/main/resources/templates/components/footer.html

@@ -65,7 +65,7 @@
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2020 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美信息技术有限公司</span></p>
                 <p>
-                    <span>粤B1-20160129 备案号 粤ICP备14019824号</span>
+                    <span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号-1</a></span><span>中华人民共和国增值电信业务经营许可证</span>
                     <span>中华人民共和国增值电信业务经营许可证</span>
                     <span>
                         <!-- CNZZ统计 start -->

src/main/resources/templates/document/details.html

@@ -56,7 +56,7 @@
         <div class="wrap copyright clear">
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2020 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美信息技术有限公司</span></p>
-                <p><span>粤B1-20160129 备案号 粤ICP备14019824号</span><span>中华人民共和国增值电信业务经营许可证</span></p>
+                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号-1</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
             </div>
         </div>
     </div>

src/main/resources/templates/document/list.html

@@ -57,7 +57,7 @@
         <div class="wrap copyright clear">
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2020 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美信息技术有限公司</span></p>
-                <p><span>粤B1-20160129 备案号 粤ICP备14019824号</span><span>中华人民共和国增值电信业务经营许可证</span></p>
+                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号-1</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
             </div>
         </div>
     </div>

src/main/resources/templates/document/more-content.html

@@ -55,7 +55,7 @@
         <div class="wrap copyright clear">
             <div class="item icon mIcon">
                 <p><span>Copyright © 2015-2020 CAIMEI365.com All Rights Reserved.</span><span>深圳市采美信息技术有限公司</span></p>
-                <p><span>粤B1-20160129 备案号 粤ICP备14019824号</span><span>中华人民共和国增值电信业务经营许可证</span></p>
+                <p><span>粤B1-20160129 备案号 <a href="https://beian.miit.gov.cn" target="_blank" style="color:#FFF;text-decoration:underline;">粤ICP备14019824号-1</a></span><span>中华人民共和国增值电信业务经营许可证</span></p>
             </div>
         </div>
     </div>