Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

liuhaonan

2022-11-18 b531004a3cbd33d7bb9f5b7dce06ddd4f5e7ec9a

 ximon-admin/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: prod
    active: xm
  jackson:
    date-format: yyyy-MM-dd HH:mm:ss
    time-zone: GMT+8
@@ -53,4 +53,5 @@

#主板rrpc通信PRODUCT_KEY
#rrpc:
#  key: a1JsfPG4iKW
#  key: a1JsfPG4iKW