From f9ef44a67fbf73f073efe65600bc25e204fde04f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 17:38:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 5e2b2ac..239fba4 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -363,6 +363,18 @@
     <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_SalePresentRateList.designer.cs">
       <DependentUpon>Gy_SalePresentRateList.cs</DependentUpon>
     </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimes.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimes.Designer.cs">
+      <DependentUpon>Gy_StdWorkTimes.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimesList.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimesList.Designer.cs">
+      <DependentUpon>Gy_StdWorkTimesList.cs</DependentUpon>
+    </Compile>
     <Compile Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_TechParamByProc.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1552,6 +1564,12 @@
     <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_WorkCenter.designer.cs">
       <DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
     </Compile>
+    <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.Designer.cs">
+      <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="stdole">
@@ -1739,6 +1757,12 @@
     <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_SalePresentRateList.resx">
       <DependentUpon>Gy_SalePresentRateList.cs</DependentUpon>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimes.resx">
+      <DependentUpon>Gy_StdWorkTimes.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_StdWorkTimesList.resx">
+      <DependentUpon>Gy_StdWorkTimesList.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="鍏敤璧勬枡\鍏朵粬鍩虹璧勬枡\Gy_TechParamByProc.resx">
       <DependentUpon>Gy_TechParamByProc.cs</DependentUpon>
@@ -2533,6 +2557,10 @@
       <SubType>Designer</SubType>
       <DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.resx">
+      <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="CLOUD鍩虹璧勬枡\" />

--
Gitblit v1.9.1