Merge remote-tracking branch '公司/master'

# Conflicts: # yudao-server/src/main/resources/testview.html
2024-07-08 20:52:03 +08:00 · 2024-07-08 20:52:03 +08:00 · d445fcc558
commit d445fcc558
parent 4d9bb5164e 251583ae79
1 changed files with 2 additions and 0 deletions
--- a/yudao-server/src/main/resources/application-dev.yaml
+++ b/yudao-server/src/main/resources/application-dev.yaml
@ -1,3 +1,5 @@
 --- #################### dev相关配置 ####################
 server:
  port: 48080