From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序; Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

---
 HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj b/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
index 01f1a03..66b1e26 100644
--- a/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
+++ b/HMI.AlermInfoManage/HMI.AlarmInfoManage.csproj
@@ -103,7 +103,7 @@
       <DependentUpon>AlarmInfoManage.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="AlarmInfoManage_Setting.xaml">
+    <Page Include="AlarmInfoManage_SettingA.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -117,8 +117,8 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AlarmInfoManage_Setting.xaml.cs">
-      <DependentUpon>AlarmInfoManage_Setting.xaml</DependentUpon>
+    <Compile Include="AlarmInfoManage_SettingA.xaml.cs">
+      <DependentUpon>AlarmInfoManage_SettingA.xaml</DependentUpon>
     </Compile>
     <Compile Include="AlarmSettingList.xaml.cs">
       <DependentUpon>AlarmSettingList.xaml</DependentUpon>

--
Gitblit v1.9.1