From 8988d0b4ab2430ed13e0672b94e3c45de0112207 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 14 十二月 2020 09:02:10 +0800
Subject: [PATCH] 若依 3.3.0

---
 ruoyi-quartz/pom.xml                           |    2 
 ruoyi-framework/pom.xml                        |    2 
 ruoyi-ui/package.json                          |    2 
 ruoyi-admin/pom.xml                            |    2 
 ruoyi-system/pom.xml                           |    2 
 ruoyi-ui/src/views/index.vue                   |   60 +++++++++++++++++++++++++++++
 ruoyi-generator/pom.xml                        |    2 
 pom.xml                                        |    4 +-
 ruoyi-admin/src/main/resources/application.yml |    2 
 ruoyi-common/pom.xml                           |    2 
 10 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e337e8..e5954a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 	
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.2.1</version>
+    <version>3.3.0</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>鑻ヤ緷绠$悊绯荤粺</description>
     
     <properties>
-        <ruoyi.version>3.2.1</ruoyi.version>
+        <ruoyi.version>3.3.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 3257d8c..febca04 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b4edbea..50a2bb5 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@
   # 鍚嶇О
   name: RuoYi
   # 鐗堟湰
-  version: 3.2.1
+  version: 3.3.0
   # 鐗堟潈骞翠唤
   copyrightYear: 2020
   # 瀹炰緥婕旂ず寮�鍏�
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 70e1aec..53e662b 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index e313f5b..e0bbf7d 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml
index 58abab1..8a768f2 100644
--- a/ruoyi-generator/pom.xml
+++ b/ruoyi-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 15a5bc2..a6068a6 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index ef2cd72..cddc6a3 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index f9d07e3..a5c2bc0 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "description": "鑻ヤ緷绠$悊绯荤粺",
   "author": "鑻ヤ緷",
   "license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index a8477b9..4a35df6 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -146,6 +146,64 @@
             <span>鏇存柊鏃ュ織</span>
           </div>
           <el-collapse accordion>
+            <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 +493,7 @@
   data() {
     return {
       // 鐗堟湰鍙�
-      version: "3.2.1",
+      version: "3.3.0",
     };
   },
   methods: {

--
Gitblit v1.9.3