From 74f10367c4bb507d086cbdc7fd11528582addfb9 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 11 Jan 2021 13:23:48 +0800
Subject: [PATCH] 修改跟进bug
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 d1a33cf..9c16a42 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
@@ -31,14 +31,12 @@
/**
* 下单时间
*/
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GTM+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date orderTime;
/**
* 收款
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date payTime;
@@ -163,6 +161,16 @@
*/
private Integer times;
+ private String type;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public Integer getTimes() {
return times;
}
--
Gitblit v1.9.1