From 071df7de41f3b3951feae4c94fc90614fb2af76c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 15 五月 2025 16:00:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 LMES/LMES.csproj |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index c15f85c..aa86cff 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,7 +27,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -126,6 +126,12 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="XiaoZhuGe_autoGetData.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="XiaoZhuGe_autoGetData.Designer.cs">
+      <DependentUpon>XiaoZhuGe_autoGetData.cs</DependentUpon>
+    </Compile>
     <Compile Include="Xt_Wait.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -160,6 +166,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="XiaoZhuGe_autoGetData.resx">
+      <DependentUpon>XiaoZhuGe_autoGetData.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Xt_Wait.resx">
       <DependentUpon>Xt_Wait.cs</DependentUpon>
       <SubType>Designer</SubType>

--
Gitblit v1.9.1