From 51ae60820da95805287e9a4448f7cc35888a8957 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 27 七月 2021 11:07:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-demo/pom.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index 4904924..dcc2684 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>${ruoyi-vue-plus.version}</version>
+        <version>2.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,4 +25,4 @@
 
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

--
Gitblit v1.9.3