From cd728738fe92b42869a3b874841e51c348389970 Mon Sep 17 00:00:00 2001
From: TianMaiCheng <746290578@qq.com>
Date: Wed, 24 Dec 2025 19:43:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=AE=9D=E6=98=93=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 UI/Controllers/UpgradeController.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/UI/Controllers/UpgradeController.cs b/UI/Controllers/UpgradeController.cs
index 1ae1950..55a8575 100644
--- a/UI/Controllers/UpgradeController.cs
+++ b/UI/Controllers/UpgradeController.cs
@@ -497,7 +497,7 @@ namespace UI.Controllers
         /// 查询设备列表
         /// </summary>
         [HttpPost()]
-        public List<RCUDBData> QueryDeviceList(int HotelID, int RoomTypeID)
+        public ActionResult QueryDeviceList(int HotelID, int RoomTypeID)
         {
             try
             {
@@ -509,15 +509,14 @@ namespace UI.Controllers
                     ,`DevAddr`
                     ,`Process`
                     FROM `blv_rcu_db`.`tbl_configured_devlist`
-                    where `hoHotelID` ={0} and `RoomTypeID`={1};", HotelID, RoomTypeID);
+                    where `HotelID` ={0} and `RoomTypeID`={1};", HotelID, RoomTypeID);
                 var Data = SqlSugarBase.RcuDb.SqlQueryable<RCUDBData>(str).ToList();
-                return Data;
+                return Json(new { Status=1,Data=Data},JsonRequestBehavior.AllowGet);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-
+                return Json(new { Status = -1, Message = "服务器错误", Detail = ex.Message  } ,JsonRequestBehavior.AllowGet);
             }
-            return new List<RCUDBData>();
         }