From 2bc39e9183e62818dcfbb3cdfc6cdca5dfa43923 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 15:37:52 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |   11 ++++++++++-
 1 files changed, 10 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..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
@@ -37,7 +37,6 @@
 	/**
 	 * 收款
 	 */
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM-8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date payTime;
 
@@ -162,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