From 4d9b4b6762c86c49f29c9f245023e45badaba771 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Mon, 24 Apr 2023 13:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BF=BB=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWYB.Client/ViewModels/Order/OrderViewModel.cs | 2 +-
 BBWYB.Client/Views/MainWindow.xaml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index 9c0c2d7..a357ce2 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -93,7 +93,7 @@ namespace BBWYB.Client.ViewModels
         private void LoadOrder(int pageIndex)
         {
             IsLoading = true;
-            var response = orderService.GetOrderList(SearchOrderId, StartDate, EndDate, OrderState, SearchProductId, SearchSku, SearchClientOrderId, SearchSourceShopName, SearchSourceSku, PageIndex, PageSize, globalContext.User.Shop.ShopId, ExcludeCanceled);
+            var response = orderService.GetOrderList(SearchOrderId, StartDate, EndDate, OrderState, SearchProductId, SearchSku, SearchClientOrderId, SearchSourceShopName, SearchSourceSku, pageIndex, PageSize, globalContext.User.Shop.ShopId, ExcludeCanceled);
 
             if (!response.Success)
             {
diff --git a/BBWYB.Client/Views/MainWindow.xaml b/BBWYB.Client/Views/MainWindow.xaml
index 41387a8..5768b89 100644
--- a/BBWYB.Client/Views/MainWindow.xaml
+++ b/BBWYB.Client/Views/MainWindow.xaml
@@ -24,7 +24,7 @@
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
                 <TextBlock Text="{Binding GlobalContext.User.Name}"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10003" Margin="5,0,0,0"/>
+                <TextBlock Text="v10004" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">