From 956970d74fa97208d0fa873ff1f8ab7ecdc393e4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 29 十月 2024 10:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/WebAPIController.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e4364b1..ce68293 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -14818,7 +14818,7 @@
                 res.count = CountConstant.FAIL;
                 res.Message = "Exception锛�" + e.ToString();
                 res.data = null;
-                return objJsonResult;
+                return res;
             }
         }
         #endregion

--
Gitblit v1.9.1