Merge remote-tracking branch 'origin/dev_长治_华特轴承' into dev_长治_华特轴承# Conflicts:# src/main/resources/application-htzc.yml
src/main/resources/application-htzc.yml @@ -28,7 +28,7 @@ # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 port: 9031 port: 9030 servlet: # 应用的访问路径 context-path: /
