Merge branch 'test' into dev

hx-admin/pom.xml

@@ -10,7 +10,7 @@
         <version>1.0</version>
     </parent>
 
-    <artifactId>hx-admin-ehsd</artifactId>
+    <artifactId>hx-admin</artifactId>
 
     <dependencies>
 

hx-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9900
+  port: 9901
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8