From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

---
 src/main/java/com/xcong/excoin/modules/coin/entity/GbzOrderEntity.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/entity/GbzOrderEntity.java b/src/main/java/com/xcong/excoin/modules/coin/entity/GbzOrderEntity.java
index e4c479a..8f772c4 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/entity/GbzOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/entity/GbzOrderEntity.java
@@ -2,14 +2,19 @@
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xcong.excoin.common.system.base.BaseEntity;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName("gbz_order")
 public class GbzOrderEntity extends BaseEntity {
+
+    @JsonFormat(pattern = "MM/dd HH:mm", timezone = "GMT+8")
+    private Date createTime;
 
     private BigDecimal price;
 
@@ -20,4 +25,6 @@
     private Long memberId;
 
     private String symbol;
+
+    private Integer status;
 }

--
Gitblit v1.9.1