Merge remote-tracking branch 'origin/dev' into dev

feat(all): 修改售后模块的服务端口
2 changed files with 2 additions and 2 deletions
--- a/blade-service/logpm-aftersales/src/main/resources/application-prod.yml
+++ b/blade-service/logpm-aftersales/src/main/resources/application-prod.yml
@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 8900
+  port: 8799

 #数据源配置
 #spring:
--- a/blade-service/logpm-aftersales/src/main/resources/application-test.yml
+++ b/blade-service/logpm-aftersales/src/main/resources/application-test.yml
@ -1,6 +1,6 @@
 #服务器端口
 server:
-  port: 6000
+  port: 8799

 #数据源配置
 #spring:
Author	SHA1	Message	Date
zhaoqiaobo	e5efe4ca74	Merge remote-tracking branch 'origin/dev' into dev	9 hours ago
zhaoqiaobo	8bf6213970	feat(all): 修改售后模块的服务端口	9 hours ago