Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-10-08 b27cc0c7af4cb9f5b404c95f90c63be22668d0a6

 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.