From 427b24942975fcea50e81ab612db1cd68b3f0b6e Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 13 Aug 2024 15:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E6=AF=81=E7=A9=BA?=
 =?UTF-8?q?=E7=93=B6=E4=B8=BA=E5=8F=96=E5=87=BA=E7=A9=BA=E7=93=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Views/AddToJiaoJieWindow.xaml       | 4 ++--
 DM_Weight/Views/ReturnEmptyDestoryWindow.xaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DM_Weight/Views/AddToJiaoJieWindow.xaml b/DM_Weight/Views/AddToJiaoJieWindow.xaml
index 9146aa7..c2e1020 100644
--- a/DM_Weight/Views/AddToJiaoJieWindow.xaml
+++ b/DM_Weight/Views/AddToJiaoJieWindow.xaml
@@ -33,7 +33,7 @@
 
             <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right">
 
-                <Button
+                <!--<Button
                     Margin="6 0 6 0"
                     ToolTip="一键补药"
                     Content="一键补药"
@@ -55,7 +55,7 @@
                     Command="{Binding CancleAdd}"
                     Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
                     Style="{StaticResource MaterialDesignOutlinedLightButton}"
-                    Content="取消" />
+                    Content="取消" />-->
                 
                 <Button
                     Margin="3 0 3 0"
diff --git a/DM_Weight/Views/ReturnEmptyDestoryWindow.xaml b/DM_Weight/Views/ReturnEmptyDestoryWindow.xaml
index 9629995..61905ab 100644
--- a/DM_Weight/Views/ReturnEmptyDestoryWindow.xaml
+++ b/DM_Weight/Views/ReturnEmptyDestoryWindow.xaml
@@ -54,7 +54,7 @@
                     VerticalAlignment="Center"
                     Command="{Binding DestoryEmptyCommand}"
                     Style="{StaticResource MaterialDesignOutlinedLightButton}"
-                    Content="销毁" />
+                    Content="取出" />
                 <Button
                     Margin="0 0 3 0"
                     VerticalAlignment="Center"