From 854d9d55a86b7076abc4f526e90001bd806d324c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jan 2021 10:19:54 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index 9c16a42..fc2f294 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -115,6 +115,8 @@
* 订单明细
*/
private List<SysOrderItem> items;
+
+ private List<SysOrderFlow> flows;
/**
* 会员姓名
*/
@@ -163,6 +165,14 @@
private String type;
+ public List<SysOrderFlow> getFlows() {
+ return flows;
+ }
+
+ public void setFlows(List<SysOrderFlow> flows) {
+ this.flows = flows;
+ }
+
public String getType() {
return type;
}
--
Gitblit v1.9.1