From 22eec752e72650a42c7208397fefdcb0e61a749d Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 19 四月 2022 10:34:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 PlanM/PlanM.csproj |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 971037a..0bf7d26 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -183,6 +183,12 @@
     <Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill.designer.cs">
       <DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
     </Compile>
+    <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.designer.cs">
+      <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
+    </Compile>
     <Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -281,6 +287,10 @@
       <DependentUpon>Gy_DataIn_RoutingBill.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
+      <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.resx">
       <DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -351,6 +361,9 @@
       <Name>SQLHelper</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

--
Gitblit v1.9.1