Merge remote-tracking branch '公司/master'

# Conflicts:
#	yudao-server/src/main/resources/testview.html
This commit is contained in:
lxd 2024-07-08 20:52:03 +08:00
commit d445fcc558

View File

@ -1,3 +1,5 @@
--- #################### dev相关配置 ####################
server:
port: 48080