From 14f20daccada2ebe169a45a326e13f4744683716 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 24 Apr 2022 23:56:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into developer

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java
index c2ac378..596c689 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/vo/LoadFenxiaoOrderBasicVo.java
@@ -17,4 +17,7 @@
 	@ApiModelProperty(value = "待结算订单")
 	private Integer waitOrderNum;
 
+	@ApiModelProperty(value = "订单金额")
+	private BigDecimal orderBalance;
+
 }

--
Gitblit v1.9.1