From f7da0c38c517bde37cd30bc060c11d15ba124d56 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 14:32:15 +0800
Subject: [PATCH] 1、修复若干问题

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |   23 +++++++++++++++++++++++
 1 files changed, 23 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 fc2f294..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
@@ -134,6 +134,8 @@
 	private	String staffName;
 	
 	private String shopName;
+
+	private String shopShortName;
 	
 	private Long searchShop;
 	/**
@@ -165,6 +167,19 @@
 
 	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;
 	}
@@ -173,6 +188,14 @@
 		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