From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge

---
 src/main/java/com/xcong/excoin/trade/ExchangeTrade.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/trade/ExchangeTrade.java b/src/main/java/com/xcong/excoin/trade/ExchangeTrade.java
index ea56d87..a73611c 100644
--- a/src/main/java/com/xcong/excoin/trade/ExchangeTrade.java
+++ b/src/main/java/com/xcong/excoin/trade/ExchangeTrade.java
@@ -5,6 +5,7 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 撮合交易信息

--
Gitblit v1.9.1