From c2ef1e65edb97ddbd00cc130e9f4dd9d47e0252d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 07 八月 2024 16:22:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/WarM.csproj |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 622dce6..c5da2b4 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -695,6 +695,18 @@
     <Compile Include="鏉$爜鎵撳嵃\Frm_Split.Designer.cs">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </Compile>
+    <Compile Include="鏉$爜鎵撳嵃\Gy_CusBarCodeBillList.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鏉$爜鎵撳嵃\Gy_CusBarCodeBillList.designer.cs">
+      <DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鏉$爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鏉$爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.designer.cs">
+      <DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
+    </Compile>
     <Compile Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1152,6 +1164,14 @@
     <EmbeddedResource Include="鏉$爜鎵撳嵃\Frm_Split.resx">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="鏉$爜鎵撳嵃\Gy_CusBarCodeBillList.resx">
+      <DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鏉$爜鎵撳嵃\Gy_CusBarCodeBill_KaiBei.resx">
+      <DependentUpon>Gy_CusBarCodeBill_KaiBei.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.resx">
       <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
       <SubType>Designer</SubType>

--
Gitblit v1.9.1