From 82b57de13d9449c48944db91d7f17b477169c324 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期四, 16 四月 2026 19:51:40 +0800
Subject: [PATCH] 合并分支
---
WebAPI/WebAPI.csproj | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index bbda9dc..71e6f72 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -685,6 +685,7 @@
<Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_PNL_TempController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\Gy_BarCodeBill_Set_TempController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Cb_OtherOutBill_CostSubjectDetailController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_AssistantDataEntryController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_BilloriginController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CostAverageTypeController.cs" />
@@ -1003,6 +1004,7 @@
<Compile Include="Models\ClsQC_RequestCheckBillSub.cs" />
<Compile Include="Models\WorkStationSub.cs" />
<Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
+ <Compile Include="Models\Xt_CheckFlowSub_Proc.cs" />
<Compile Include="Models\鍩虹璧勬枡\ClsGy_EmployeeSub.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
<Compile Include="Models\Employee.cs" />
@@ -1316,8 +1318,11 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="bin\" />
<Folder Include="Controllers\椤圭洰绠＄悊\鍩虹寤烘ā\" />
<Folder Include="DLL\SBGL\SBBB\" />
+ <Folder Include="obj\x86\Debug\" />
+ <Folder Include="Views\Cb_OtherOutBill_CostSubjectDetail\" />
<Folder Include="Views\CB_WipProcessTable\" />
<Folder Include="Views\Cg_ContractTransportBillList\" />
<Folder Include="Views\Cg_PODemandPlanBill\" />
--
Gitblit v1.9.1