From cc74efb36fd1f1de56b3acb2ba59d4b416eaed4f Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 19 Jan 2021 00:23:21 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 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..7f34c77 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;
 	/**
 	 * 会员姓名
 	 */
@@ -132,6 +134,8 @@
 	private	String staffName;
 	
 	private String shopName;
+
+	private String shopShortName;
 	
 	private Long searchShop;
 	/**
@@ -163,6 +167,35 @@
 
 	private String type;
 
+	/**
+	 * 原有订单ID 退款时使用
+	 */
+	private Long oldOrderId;
+
+	public Long getOldOrderId() {
+		return oldOrderId;
+	}
+
+	public void setOldOrderId(Long oldOrderId) {
+		this.oldOrderId = oldOrderId;
+	}
+
+	public List<SysOrderFlow> getFlows() {
+		return flows;
+	}
+
+	public void setFlows(List<SysOrderFlow> flows) {
+		this.flows = flows;
+	}
+
+	public String getShopShortName() {
+		return shopShortName;
+	}
+
+	public void setShopShortName(String shopShortName) {
+		this.shopShortName = shopShortName;
+	}
+
 	public String getType() {
 		return type;
 	}

--
Gitblit v1.9.1