Merge remote-tracking branch 'origin/master'

aijinhui

2023-10-24 8a87e4226aa802d6a0e3566c66824fedf68e77da

 ruoyi-admin/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -46,6 +46,11 @@
      "description": "Description for mediamtx.host."
    },
    {
      "name": "mediamtx.software_decoding",
      "type": "java.lang.String",
      "description": "Description for mediamtx.software_decoding."
    },
    {
      "name": "mqtt.host",
      "type": "java.lang.String",
      "description": "Description for mqtt.host."