From 4fa8b88c4a07d89bdfa902d7fd4a508e0e51401d Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Tue, 11 Jul 2023 17:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88=EF=BC=9ARuoyi-Fle?=
 =?UTF-8?q?x=20V4.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                      |  2 +-
 pom.xml                                        |  2 +-
 ruoyi-admin/src/main/resources/application.yml |  2 +-
 ruoyi-ui/package.json                          |  2 +-
 ruoyi-ui/src/views/index.vue                   | 12 +++++++++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0d75604..564ac0b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Ruoyi-Flex V4.1.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Ruoyi-Flex V4.1.1</h1>
 <h4 align="center">Ruoyi-Flex是基于RuoYi-Vue V3.8.6 前后端分离的Java快速开发框架</h4>
 
 
diff --git a/pom.xml b/pom.xml
index 02af71e..50dba03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <description>若依管理系统</description>
     
     <properties>
-        <revision>4.1.0</revision>
+        <revision>4.1.1</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6a9bc68..d2712ef 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
   # 名称
   name: RuoYi-Flex
   # 版本
-  version: 4.1.0
+  version: 4.1.1
   # 版权年份
   copyrightYear: 2023
   # 实例演示开关
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 547b71a..e03215f 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "RuoYi-Flex",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "RuoYi-Flex管理系统",
   "author": "数据小王子",
   "license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index d65a308..582bfcb 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -137,6 +137,16 @@
           </div>
           <el-collapse accordion>
 
+            <el-collapse-item title="v4.1.1 - 2023-07-11">
+              <ol>
+                <li>优化代码</li>
+                <li>完美兼容RuoYi-Vue代码生成，生成的单表、树表、主子表mybatis代码运行正常</li>
+                <li>解决generator.yml中文乱码问题</li>
+                <li>使用flatten-maven-plugin插件集中管理软件版本号</li>
+                <li>同步RuoYi-Vue 2023-07-06更新</li>
+                <li>参考RuoYi-Cloud，增加ruoyi-modules模块，调整项目结构</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v4.1.0 - 2023-07-06">
               <ol>
                 <li>全局设置数据库表主键为雪花算法</li>
@@ -182,7 +192,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "4.1.0"
+      version: "4.1.1"
     };
   },
   methods: {