From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/Gs.DevApp.csproj |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1054851..8022b31 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -683,11 +683,11 @@
     <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
       <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
+    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
-      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+    <Compile Include="DevFrm\RkQC\Frm_ShouTuoDetect01.Designer.cs">
+      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.cs">
       <SubType>Form</SubType>
@@ -1738,8 +1738,8 @@
     <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
       <DependentUpon>Frm_Cqsq.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
-      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\RkQC\Frm_ShouTuoDetect01.resx">
+      <DependentUpon>Frm_ShouTuoDetect01.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
       <DependentUpon>RkDetect01.cs</DependentUpon>

--
Gitblit v1.9.3