From 7b9cb4464cf7a6db758214c5681b0ecdf01e3db4 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Jan 2021 16:22:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api
---
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