Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-13 1bca1b9c61676b48cc3137d3003e520c75ecdd92

 ruoyi-admin/src/main/resources/application-dev.yml

@@ -67,4 +67,7 @@
  topic: minioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3,radarForceGuide
  timeout: 100
  keepalive: 60
  enabled: true
#三一车辆开关
syCar:
  enabled: true