Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-13 1bca1b9c61676b48cc3137d3003e520c75ecdd92

 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."