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

guoyuji

2024-04-25 205657134d435d84114c4bb7663c17d76575cbaa

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

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

server:
  port: 8080
  port: 8086



spring: