Merge branch 'dev' into test

pom.xml

@@ -28,7 +28,7 @@
     </modules>
 
     <name>${project.artifactId}</name>
-    <description>芋道项目基础脚手架</description>
+    <description>ZT项目基础脚手架</description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
@@ -271,7 +271,14 @@
         <profile>
             <id>chenbowen</id>
             <properties>
+                <env.name>local</env.name>
+                <!--                <config.server-addr>localhost:8848</config.server-addr>-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
                 <config.namespace>chenbowen</config.namespace>
+                <config.group>DEFAULT_GROUP</config.group>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
+                <config.version>1.0.0</config.version>
             </properties>
         </profile>
         <profile>