Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

2025-08-19 f4d5aa97370f698c63b0b9f185f06e7bae56975c

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -773,6 +773,12 @@
    <Compile Include="DevFrm\Rpt\WomShjhShow.Designer.cs">
      <DependentUpon>WomShjhShow.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rpt\WOTraceCodes.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\Rpt\WOTraceCodes.Designer.cs">
      <DependentUpon>WOTraceCodes.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1798,6 +1804,9 @@
    <EmbeddedResource Include="DevFrm\Rpt\WomShjhShow.resx">
      <DependentUpon>WomShjhShow.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rpt\WOTraceCodes.resx">
      <DependentUpon>WOTraceCodes.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
      <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
    </EmbeddedResource>
@@ -2458,6 +2467,12 @@
    <None Include="Resources\useinformula_16x16.png" />
    <None Include="Resources\boposition2_16x162.png" />
    <None Include="Resources\apply_16x16.png" />
    <None Include="Resources\ok12341.jpg" />
    <None Include="Resources\error6.jpg" />
    <None Include="Resources\error61.jpg" />
    <None Include="Resources\error9.jpg" />
    <None Include="Resources\error10.jpg" />
    <None Include="Resources\ok10.jpg" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />