From efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 29 六月 2023 14:55:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 PlanM/PlanM.csproj |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/PlanM/PlanM.csproj b/PlanM/PlanM.csproj
index 0a55294..026fa9a 100644
--- a/PlanM/PlanM.csproj
+++ b/PlanM/PlanM.csproj
@@ -189,12 +189,6 @@
     <Compile Include="鏁版嵁瀵煎叆\Gy_DataIn_RoutingBill_New.designer.cs">
       <DependentUpon>Gy_DataIn_RoutingBill_New.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_ICBomBill.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -291,9 +285,6 @@
       <DependentUpon>Gy_DataIn_RoutingBill_New.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="鏁版嵁瀵煎叆\Gy_StdWorkTimes_RoutingBill.resx">
-      <DependentUpon>Gy_StdWorkTimes_RoutingBill.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="璁″垝绠$悊\Gy_ICBomBill.resx">
       <DependentUpon>Gy_ICBomBill.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -360,6 +351,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