From 633a573ec886a2e2411480163f91091cf2b28cd0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:31:17 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
index fd8e9c5..30af7a7 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipRepairSendWorkBillController.cs
@@ -294,7 +294,7 @@
i++;
}
- //淇濆瓨鍓嶆帶鍒�=========================================
+ //淇濆瓨鍚庢帶鍒�=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Sb_EquipRepairSendWorkBill_AfterSaveCtrl " + omodel.HInterID + ",'" + omodel.HBillNo + "','',1", "h_p_Sb_EquipRepairSendWorkBill_AfterSaveCtrl");
if (ds == null)
{
--
Gitblit v1.9.1