From 63107c99b7ae0901ad582ce37b7ecb3095cf9991 Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Mon, 7 Nov 2022 01:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ghy/web/controller/order/OrderController.java | 1 +
 .../src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index e64d025c..1c424bf8 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -954,6 +954,7 @@ public class OrderController extends BaseController {
             orderListResponse.setCustomerRemark(master.getRemark());
             orderListResponse.setOrderTimeoutRecords(timeoutRecords);
             orderListResponse.setChangeMoney(changeMoney);
+            orderListResponse.setServerMoney(financialMaster.getServerMoney());
             orderListResponse.setAfterServiceRecordList(afterServiceRecords);
             orderListResponses.add(orderListResponse);
 
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index c306ebff..86a6ebbd 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -87,6 +87,8 @@ public class OrderListResponse {
 
     private Boolean isOverTime;
 
+    private BigDecimal serverMoney;
+
     private List<OrderTimeoutRecord> orderTimeoutRecords;
 
     private List<OrderStandard> standardList;