From 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 26 七月 2025 15:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

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

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ac3e49c..3d20e99 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -416,6 +416,12 @@
     <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.Designer.cs">
       <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesDeToLine.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesDeToLine.Designer.cs">
+      <DependentUpon>Frm_MesDeToLine.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1615,6 +1621,9 @@
     <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesAttanCon.resx">
       <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesDeToLine.resx">
+      <DependentUpon>Frm_MesDeToLine.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
       <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3