From 1f99c554ffc67f599fbce5981a3da584945b3b16 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 18 八月 2025 14:24:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

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

diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 16a9333..c2ede60 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -500,6 +500,12 @@
     <Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
       <DependentUpon>SelectItem.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\PDA\SelectLine.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\PDA\SelectLine.Designer.cs">
+      <DependentUpon>SelectLine.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\PDA\SelectPage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1684,6 +1690,9 @@
     <EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
       <DependentUpon>SelectItem.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
+      <DependentUpon>SelectLine.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\PDA\SelectPage.resx">
       <DependentUpon>SelectPage.cs</DependentUpon>
     </EmbeddedResource>
@@ -2449,6 +2458,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 />

--
Gitblit v1.9.3