From 5a1414b09e8a25e04448a22359102624e3e3bf01 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Fri, 16 Jun 2023 16:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Tourism/View/ItemStorageView.xaml | 2 +-
 BPASmartClient.Tourism/View/Monitor.xaml         | 1 +
 BPASmartClient/BPASmartClient.csproj             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/BPASmartClient.Tourism/View/ItemStorageView.xaml b/BPASmartClient.Tourism/View/ItemStorageView.xaml
index 6d9b3e20..3310ea7e 100644
--- a/BPASmartClient.Tourism/View/ItemStorageView.xaml
+++ b/BPASmartClient.Tourism/View/ItemStorageView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+             d:DesignHeight="450" d:DesignWidth="800" Name="库位状态">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/BPASmartClient.Tourism/View/Monitor.xaml b/BPASmartClient.Tourism/View/Monitor.xaml
index 25a9c593..c1867083 100644
--- a/BPASmartClient.Tourism/View/Monitor.xaml
+++ b/BPASmartClient.Tourism/View/Monitor.xaml
@@ -19,6 +19,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Recdictionarys/GlobalStyle.xaml" />
                 <ResourceDictionary>
                     <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
                     <SolidColorBrush x:Key="FontColor" Color="#FF2AB2E7" />
diff --git a/BPASmartClient/BPASmartClient.csproj b/BPASmartClient/BPASmartClient.csproj
index 3d48218b..fddb052c 100644
--- a/BPASmartClient/BPASmartClient.csproj
+++ b/BPASmartClient/BPASmartClient.csproj
@@ -45,6 +45,7 @@
     <ProjectReference Include="..\BPASmartClient.MorkT_Container\BPASmartClient.MorkT_Container.csproj" />
     <ProjectReference Include="..\BPASmartClient.MorkT_HQ\BPASmartClient.MorkTHQ.csproj" />
     <ProjectReference Include="..\BPASmartClient.SCChip\BPASmartClient.SCChip.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Tourism\BPASmartClient.TourismCollege.csproj" />
     <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
   </ItemGroup>