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

cnf

2025-09-01 5afff49d3471e7c966f5e7d5ed30c28891f71c5d

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -997,11 +997,11 @@
    <Compile Include="UserControl\SelectDeleteBar.Designer.cs">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\SelectKw.cs">
      <SubType>Form</SubType>
    <Compile Include="UserControl\UcBtnPrintOne.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="UserControl\SelectKw.Designer.cs">
      <DependentUpon>SelectKw.cs</DependentUpon>
    <Compile Include="UserControl\UcBtnPrintOne.Designer.cs">
      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
    </Compile>
    <Compile Include="UserControl\UcDictionaryComBox.cs">
      <SubType>UserControl</SubType>
@@ -1756,8 +1756,8 @@
    <EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
      <DependentUpon>SelectDeleteBar.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\SelectKw.resx">
      <DependentUpon>SelectKw.cs</DependentUpon>
    <EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
      <DependentUpon>UcBtnPrintOne.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
      <DependentUpon>UcDictionaryComBox.cs</DependentUpon>