From a7d93d38ce810934f78129aa18eb88f0313128fb Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 26 Aug 2020 14:25:41 +0800
Subject: [PATCH] 生成页面时不忽略remark属性

---
 pom.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 112369e..11524c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>2.0.0</ruoyi.version>
+        <ruoyi.version>2.1.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>
@@ -21,6 +21,7 @@
         <spring-cloud.version>Hoxton.SR4</spring-cloud.version>
 		<spring-boot-admin.version>2.2.3</spring-boot-admin.version>
         <spring-boot.mybatis>2.1.2</spring-boot.mybatis>
+        <nacos.version>1.3.0</nacos.version>
         <swagger.fox.version>2.9.2</swagger.fox.version>
         <swagger.core.version>1.5.24</swagger.core.version>
         <kaptcha.version>2.3.2</kaptcha.version>
@@ -28,7 +29,7 @@
         <commons.io.version>2.5</commons.io.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <velocity.version>1.7</velocity.version>
-        <fastjson.version>1.2.70</fastjson.version>
+        <fastjson.version>1.2.73</fastjson.version>
 		<poi.version>3.17</poi.version>
         <common-pool.version>2.6.2</common-pool.version>
     </properties>
@@ -55,6 +56,13 @@
                 <scope>import</scope>
             </dependency>
 
+			<!-- Alibaba Nacos 配置 -->
+			<dependency>
+			    <groupId>com.alibaba.nacos</groupId>
+			    <artifactId>nacos-client</artifactId>
+			    <version>${nacos.version}</version>
+			</dependency>
+
             <!-- SpringBoot 依赖配置 -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>

--
Gitblit v1.9.3