From 549df1cac1529f4fc9b5d9b64e27de5d5d8b8951 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 22 十月 2025 13:53:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e035591..f52ff93 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20179,6 +20179,7 @@
}
}
+
/// <summary>
/// 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇妫�楠屾柟妗�
/// </summary>
@@ -22614,6 +22615,7 @@
}
}
+ #region 灏忓崼鐢靛櫒鑾峰彇鐗╂枡鏉＄爜瀵瑰簲鍗曟嵁
/// <summary>
/// 灏忓崼鐢靛櫒鑾峰彇鐗╂枡鏉＄爜瀵瑰簲鍗曟嵁
/// </summary>
@@ -22644,14 +22646,6 @@
objjson.data = ds.Tables[0];
return objjson;
}
-
-
-
- objjson.code = "1";
- objjson.count = 1;
- objjson.Message = "鑾峰彇鎴愬姛!";
- objjson.data = ds.Tables[0];
- return objjson;
}
catch (Exception ex)
{
@@ -22663,5 +22657,9 @@
}
}
+ #endregion
+
+
+
}
}
--
Gitblit v1.9.1