Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-03-22 bd8f3a15f17facd2f77521da844eaf76dca22bad

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

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

server:
  port: 8080
  port: 8086


spring: