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

yxj

2024-06-18 d3473e15fd14ea84a1378f3d3841bcad16c2d9f3

 PlanM/PlanM.csproj

@@ -183,12 +183,6 @@
    <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>
@@ -285,10 +279,6 @@
    </EmbeddedResource>
    <EmbeddedResource Include="数据导入\Gy_DataIn_RoutingBill.resx">
      <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">