From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
index 5bb7683..83d8665 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj
@@ -19,16 +19,20 @@
<Compile Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.Designer.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.cs" />
<Compile Remove="01-pump\PumpProductMainPanel - 澶嶅埗.Designer.cs" />
+ <Compile Remove="10-equipment\ManufacturerMainPanel.cs" />
+ <Compile Remove="10-equipment\ManufacturerMainPanel.designer.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="01-pump\AddPumpProductMainDlg - 澶嶅埗.resx" />
<EmbeddedResource Remove="01-pump\PumpProductMainPanel - 澶嶅埗.resx" />
+ <EmbeddedResource Remove="10-equipment\ManufacturerMainPanel.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
+ <PackageReference Include="Yw.BLL.Assets.Core" Version="3.0.1" />
</ItemGroup>
<ItemGroup>
@@ -104,22 +108,22 @@
<Compile Update="05-elbow\02-main\ElbowManageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="04-pipeline\01-series\AddPipeLineSeriesDlg.cs">
+ <Compile Update="04-pipe\01-series\AddPipeLineSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipeline\01-series\EditPipeLineSeriesDlg.cs">
+ <Compile Update="04-pipe\01-series\EditPipeLineSeriesDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipeline\02-main\EditPipeLineMainDlg.cs">
+ <Compile Update="04-pipe\02-main\EditPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipeline\02-main\AddPipeLineMainDlg.cs">
+ <Compile Update="04-pipe\02-main\AddPipeMainDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-pipeline\02-main\PipelineManageMainPanel.cs">
+ <Compile Update="04-pipe\02-main\PipeManageMainPanel.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="04-pipeline\01-series\PipeLineTreeListCtrl.cs">
+ <Compile Update="04-pipe\01-series\PipeLineTreeListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="07-fourLink\02-main\AddFourLinkMainDlg.cs">
@@ -160,4 +164,8 @@
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="10-equipment\" />
+ </ItemGroup>
+
</Project>
--
Gitblit v1.9.3