From 4286ee5823987af404e167a7c4aeacbe7def3c36 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 27 七月 2022 10:19:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master

---
 BaseSet/BaseSet.csproj |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 239fba4..5ba733e 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -195,6 +195,12 @@
     <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConveyComp.designer.cs">
       <DependentUpon>Gy_ConveyComp.cs</DependentUpon>
     </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.designer.cs">
+      <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon>
+    </Compile>
     <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1646,6 +1652,10 @@
       <DependentUpon>Gy_ConveyComp.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.resx">
+      <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.resx">
       <DependentUpon>Gy_EntryComp.cs</DependentUpon>
       <SubType>Designer</SubType>

--
Gitblit v1.9.1