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/WebAPI.csproj | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1a3aea8..18e97f5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -512,6 +512,7 @@
<Compile Include="Controllers\SCGL\Sc_ProductionCycleBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESStopRestoreWorkBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_FeedingErrorProofingBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
<Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
--
Gitblit v1.9.1