From ba927b1faad68ab38d053ee9ea9eeac4b1a5531b Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 08:23:10 +0800
Subject: [PATCH] resolve merge conflicts: keep theirs for all binary files
---
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index b801c1c..bc7ed76 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -2473,6 +2473,7 @@
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
}
else if (refSav == "Update")
{
@@ -2525,7 +2526,7 @@
tableList.Add(ds.Tables[1]);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
+ objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "false锛�";
objJsonResult.data = null;
--
Gitblit v1.9.1