Merge branch 'dev' into 'mp-server-test'

8091

See merge request quanshu/mp-server!1

mp-admin/src/main/resources/application-test.yml

@@ -10,7 +10,7 @@ pay:
 
 # 日志配置
 logging:
-  config: classpath:logback-8090.xml
+  config: classpath:logback-8091.xml
   level:
     com.qs.mp: debug
     org.springframework: warn
@@ -92,7 +92,7 @@ spring:
 # 环境配置
 server:
   # 服务端口
-  port: 8090
+  port: 8091
   servlet:
     # 项目contextPath
     context-path: /