From 16da0ad1fda1dffa3019425a6887d38ed4217f44 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 10 Jan 2021 14:26:02 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 6b46164..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
@@ -37,7 +37,6 @@
/**
* 收款
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM-8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date payTime;
@@ -116,6 +115,8 @@
* 订单明细
*/
private List<SysOrderItem> items;
+
+ private List<SysOrderFlow> flows;
/**
* 会员姓名
*/
@@ -162,6 +163,24 @@
*/
private Integer times;
+ private String type;
+
+ public List<SysOrderFlow> getFlows() {
+ return flows;
+ }
+
+ public void setFlows(List<SysOrderFlow> flows) {
+ this.flows = flows;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public Integer getTimes() {
return times;
}
--
Gitblit v1.9.1