From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/META-INF/spring-configuration-metadata.json |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/META-INF/spring-configuration-metadata.json b/ruoyi-admin/src/main/resources/META-INF/spring-configuration-metadata.json
index c074bd6..dc0f212 100644
--- a/ruoyi-admin/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/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."

--
Gitblit v1.9.3