From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-ui/src/views/index.vue |   98 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 55f3439..dc189c7 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/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>
@@ -146,6 +146,96 @@
             <span>鏇存柊鏃ュ織</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v3.4.0 - 2021-02-22">
+              <ol>
+                <li>浠g爜鐢熸垚妯℃澘鏀寔涓诲瓙琛�</li>
+                <li>琛ㄦ牸鍙充晶宸ュ叿鏍忕粍浠舵敮鎸佹樉闅愬垪</li>
+                <li>鍥剧墖缁勪欢娣诲姞棰勮&绉婚櫎鍔熻兘</li>
+                <li>Excel娉ㄨВ鏀寔Image鍥剧墖瀵煎嚭</li>
+                <li>鎿嶄綔鎸夐挳缁勮皟鏁翠负鏈寸礌鎸夐挳鏍峰紡</li>
+                <li>浠g爜鐢熸垚鏀寔鏂囦欢涓婁紶缁勪欢</li>
+                <li>浠g爜鐢熸垚鏃ユ湡鎺т欢鍖哄垎鑼冨洿</li>
+                <li>浠g爜鐢熸垚鏁版嵁搴撴枃鏈被鍨嬬敓鎴愯〃鍗曟枃鏈煙</li>
+                <li>鐢ㄦ埛鎵嬫満閭&鑿滃崟缁勪欢淇敼鍏佽绌哄瓧绗︿覆</li>
+                <li>鍗囩骇SpringBoot鍒版渶鏂扮増鏈�2.2.13 鎻愬崌鍚姩閫熷害</li>
+                <li>鍗囩骇druid鍒版渶鏂扮増鏈瑅1.2.4</li>
+                <li>鍗囩骇fastjson鍒版渶鏂扮増1.2.75</li>
+                <li>鍗囩骇element-ui鍒版渶鏂扮増鏈�2.15.0</li>
+                <li>淇IE11娴忚鍣ㄦ姤閿欓棶棰�</li>
+                <li>浼樺寲澶氱骇鑿滃崟涔嬮棿鍒囨崲鏃犳硶缂撳瓨鐨勯棶棰�</li>
+                <li>淇鍥涚骇鑿滃崟鏃犳硶鏄剧ず闂</li>
+                <li>淇渚ц竟鏍忛潤鎬佽矾鐢变涪澶遍棶棰�</li>
+                <li>淇瑙掕壊绠$悊-缂栬緫瑙掕壊-鍔熻兘鏉冮檺鏄剧ず寮傚父</li>
+                <li>閰嶇疆鏂囦欢鏂板redis鏁版嵁搴撶储寮曞睘鎬�</li>
+                <li>鏉冮檺宸ュ叿绫诲鍔燼dmin鍒ゆ柇</li>
+                <li>瑙掕壊闈炶嚜瀹氫箟鏉冮檺鑼冨洿娓呯┖閫夋嫨鍊�</li>
+                <li>淇瀵煎叆鏁版嵁涓鸿礋娴偣鏁版椂涓㈠け绮惧害闂</li>
+                <li>绉婚櫎path-to-regexp姝e垯鍖归厤鎻掍欢</li>
+                <li>淇鐢熸垚鏍戣〃浠g爜寮傚父</li>
+                <li>淇敼ip瀛楁闀垮害闃叉ipv6鍦板潃闀垮害涓嶅</li>
+                <li>闃叉get璇锋眰鍙傛暟鍊间负false鎴�0绛夌壒娈婂�间細瀵艰嚧鏃犳硶姝g‘鐨勪紶鍙�</li>
+                <li>鐧诲綍鍚巔ush娣诲姞catch闃叉鍑虹幇妫�鏌ラ敊璇�</li>
+                <li>鍏朵粬缁嗚妭浼樺寲</li>
+              </ol>
+            </el-collapse-item>
+            <el-collapse-item title="v3.3.0 - 2020-12-14">
+              <ol>
+                <li>鏂板缂撳瓨鐩戞帶鍔熻兘</li>
+                <li>鏀寔涓婚椋庢牸閰嶇疆</li>
+                <li>淇澶氱骇鑿滃崟涔嬮棿鍒囨崲鏃犳硶缂撳瓨鐨勯棶棰�</li>
+                <li>澶氱骇鑿滃崟鑷姩閰嶇疆缁勪欢</li>
+                <li>浠g爜鐢熸垚棰勮鏀寔楂樹寒鏄剧ず</li>
+                <li>鏀寔Get璇锋眰鏄犲皠Params鍙傛暟</li>
+                <li>鍒犻櫎鐢ㄦ埛鍜岃鑹茶В缁戝叧鑱�</li>
+                <li>鍘婚櫎鐢ㄦ埛鎵嬫満閭閮ㄩ棬蹇呭~楠岃瘉</li>
+                <li>Excel鏀寔娉ㄨВalign瀵归綈鏂瑰紡</li>
+                <li>Excel鏀寔瀵煎叆Boolean鍨嬫暟鎹�</li>
+                <li>浼樺寲澶村儚鏍峰紡锛岄紶鏍囩Щ鍏ユ偓鍋滈伄缃�</li>
+                <li>浠g爜鐢熸垚棰勮鎻愪緵婊氬姩鏈哄埗</li>
+                <li>浠g爜鐢熸垚鍒犻櫎澶氫綑鐨勬暟瀛梖loat绫诲瀷</li>
+                <li>淇杞崲瀛楃涓茬殑鐩爣瀛楃闆嗗睘鎬�</li>
+                <li>鍥炴樉鏁版嵁瀛楀吀闃叉绌哄�兼姤閿�</li>
+                <li>鏃ュ織璁板綍澧炲姞杩囨护澶氭枃浠跺満鏅�</li>
+                <li>淇敼缂撳瓨Set鏂规硶鍙兘瀵艰嚧宓屽鐨勯棶棰�</li>
+                <li>绉婚櫎鍓嶇涓�浜涘浣欑殑渚濊禆</li>
+                <li>闃叉瀹夊叏鎵弿YUI鍑虹幇鐨勯闄╂彁绀�</li>
+                <li>淇敼node-sass涓篸art-sass</li>
+                <li>鍗囩骇SpringBoot鍒版渶鏂扮増鏈�2.1.18</li>
+                <li>鍗囩骇poi鍒版渶鏂扮増鏈�4.1.2</li>
+                <li>鍗囩骇oshi鍒版渶鏂扮増鏈瑅5.3.6</li>
+                <li>鍗囩骇bitwalker鍒版渶鏂扮増鏈�1.21</li>
+                <li>鍗囩骇axios鍒版渶鏂扮増鏈�0.21.0</li>
+                <li>鍗囩骇element-ui鍒版渶鏂扮増鏈�2.14.1</li>
+                <li>鍗囩骇vue鍒版渶鏂扮増鏈�2.6.12</li>
+                <li>鍗囩骇vuex鍒版渶鏂扮増鏈�3.6.0</li>
+                <li>鍗囩骇vue-cli鍒扮増鏈�4.5.9</li>
+                <li>鍗囩骇vue-router鍒版渶鏂扮増鏈�3.4.9</li>
+                <li>鍗囩骇vue-cli鍒版渶鏂扮増鏈�4.4.6</li>
+                <li>鍗囩骇vue-cropper鍒版渶鏂扮増鏈�0.5.5</li>
+                <li>鍗囩骇clipboard鍒版渶鏂扮増鏈�2.0.6</li>
+                <li>鍗囩骇core-js鍒版渶鏂扮増鏈�3.8.1</li>
+                <li>鍗囩骇echarts鍒版渶鏂扮増鏈�4.9.0</li>
+                <li>鍗囩骇file-saver鍒版渶鏂扮増鏈�2.0.4</li>
+                <li>鍗囩骇fuse.js鍒版渶鏂扮増鏈�6.4.3</li>
+                <li>鍗囩骇js-beautify鍒版渶鏂扮増鏈�1.13.0</li>
+                <li>鍗囩骇js-cookie鍒版渶鏂扮増鏈�2.2.1</li>
+                <li>鍗囩骇path-to-regexp鍒版渶鏂扮増鏈�6.2.0</li>
+                <li>鍗囩骇quill鍒版渶鏂扮増鏈�1.3.7</li>
+                <li>鍗囩骇screenfull鍒版渶鏂扮増鏈�5.0.2</li>
+                <li>鍗囩骇sortablejs鍒版渶鏂扮増鏈�1.10.2</li>
+                <li>鍗囩骇vuedraggable鍒版渶鏂扮増鏈�2.24.3</li>
+                <li>鍗囩骇chalk鍒版渶鏂扮増鏈�4.1.0</li>
+                <li>鍗囩骇eslint鍒版渶鏂扮増鏈�7.15.0</li>
+                <li>鍗囩骇eslint-plugin-vue鍒版渶鏂扮増鏈�7.2.0</li>
+                <li>鍗囩骇lint-staged鍒版渶鏂扮増鏈�10.5.3</li>
+                <li>鍗囩骇runjs鍒版渶鏂扮増鏈�4.4.2</li>
+                <li>鍗囩骇sass-loader鍒版渶鏂扮増鏈�10.1.0</li>
+                <li>鍗囩骇script-ext-html-webpack-plugin鍒版渶鏂扮増鏈�2.1.5</li>
+                <li>鍗囩骇svg-sprite-loader鍒版渶鏂扮増鏈�5.1.1</li>
+                <li>鍗囩骇vue-template-compiler鍒版渶鏂扮増鏈�2.6.12</li>
+                <li>鍏朵粬缁嗚妭浼樺寲</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v3.2.1 - 2020-11-18">
               <ol>
                 <li>闃绘浠绘剰鏂囦欢涓嬭浇婕忔礊</li>
@@ -435,7 +525,7 @@
   data() {
     return {
       // 鐗堟湰鍙�
-      version: "3.2.1",
+      version: "3.4.0",
     };
   },
   methods: {

--
Gitblit v1.9.3