From b885e1eeff6b9efde7fd4bfdb3ae11edc88c41b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Sat, 15 May 2021 14:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=20v2.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    |  2 +-
 pom.xml                      |  2 +-
 ruoyi-ui/package.json        |  2 +-
 ruoyi-ui/src/views/index.vue | 10 +++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 277f48de..a98bde53 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 * 升级 swagger 为 knife4j
 * 集成 Hutool 5.X 并重写RuoYi部分功能
 * 集成 Feign 接口化管理 Http 请求(如三方请求 支付,短信,推送等)
-* 集成 spring-boot-admin 全方位监控
+* 移除 自带服务监控 改为 spring-boot-admin 全方位监控
 * 增加 demo 模块示例(给不会增加模块的小伙伴做参考)
 
 ### 代码改动
diff --git a/pom.xml b/pom.xml
index edd86213..62930f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <description>RuoYi-Vue-Plus后台管理系统</description>
     
     <properties>
-        <ruoyi-vue-plus.version>2.0.0</ruoyi-vue-plus.version>
+        <ruoyi-vue-plus.version>2.1.0</ruoyi-vue-plus.version>
         <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 313d7211..0ac7e155 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi-vue-plus",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "RuoYi-Vue-Plus后台管理系统",
   "author": "LionLi",
   "license": "MIT",
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 84921bce..9cee59a1 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -80,6 +80,14 @@
             <span>更新日志</span>
           </div>
           <el-collapse accordion>
+            <el-collapse-item title="v2.1.0 - 2021-5-17">
+              <ol>
+                <li>update swagger升级3.0.2</li>
+                <li>update 增强分页工具兼容性</li>
+                <li>update 通用Service接口 增加自定义vo转换函数</li>
+                <li>remove 移除ruoyi自带服务监控(Admin已全部包含)</li>
+              </ol>
+            </el-collapse-item>
             <el-collapse-item title="v2.0.0 - 2021-5-15">
               <ol>
                 <li>springboot 升级 2.3.10 依赖全面升级适配</li>
@@ -140,7 +148,7 @@ export default {
   data() {
     return {
       // 版本号
-      version: "2.0.0",
+      version: "2.1.0",
     };
   },
   methods: {