Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient

lu

2024-10-25 ce8e6ea5d262001b2b4bd711a85e18d8e0071003

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -223,12 +223,26 @@
    <Compile Include="DevFrm\BasicData\Frm_MesUnit.Designer.cs">
      <DependentUpon>Frm_MesUnit.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs">
      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDt.Designer.cs">
      <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesSysLookups.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs">
      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\Models\MesQmCheckitem.cs" />
    <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
    <Compile Include="DevFrm\Rpt\RptPreview.cs">
@@ -443,6 +457,12 @@
    <EmbeddedResource Include="DevFrm\FrmMain.resx">
      <DependentUpon>FrmMain.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
      <DependentUpon>Frm_IQCLookups.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDt.resx">
      <DependentUpon>Frm_MesQmCheckitemDt.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\QC\Frm_MesSysLookups.resx">
      <DependentUpon>Frm_MesSysLookups.cs</DependentUpon>
    </EmbeddedResource>
@@ -644,10 +664,10 @@
    <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" />
  </Target>
  <!-- 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.
  <Target Name="BeforeBuild">
  </Target>
  <Target Name="AfterBuild">
  </Target>
  -->
         Other similar extension points exist, see Microsoft.Common.targets.
    <Target Name="BeforeBuild">
    </Target>
    <Target Name="AfterBuild">
    </Target>
    -->
</Project>