Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-10-28 11ff07252c6e6ed90e810cd9e5d033e7c7438a45

 server/web/src/main/resources/application.yml

@@ -9,7 +9,7 @@
#  application:
#    name: parkbike
  profiles:
    active: dev
    active: test
  # JSON返回配置
  jackson:
    # 默认时区
@@ -60,4 +60,7 @@

  # WEB服务器配置
server:
   port: 10013
   port: 10025

mqtt:
  clientid: doumeetestweb