Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

	README.md

	ruoyi-ui/src/views/index.vue

ruoyi-ui/src/views/index.vue

@@ -119,9 +119,9 @@
             </p>
             <p>
               <i class="el-icon-user-solid"></i> QQ群：<s>满937441</s>
-              <s>满887144332</s> <s>满180251782</s>
-              <a href="https://jq.qq.com/?_wv=1027&k=4WWwqNxN" target="_blank"
-                > 104180207</a
+              <s>满887144332</s> <s>满180251782</s> <s>满104180207</s>
+              <a href="https://jq.qq.com/?_wv=1027&k=VvjN2nvu" target="_blank"
+                > 186866453</a
               >
             </p>
             <p>