Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-23 8449b7205be9e73ddd353f9835a40fd1d72462d4

 north-glass-erp/target/classes/application.yml

@@ -1,6 +1,6 @@

server:
  port: 8086
  port: 8080


spring: