From bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 15:38:42 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

---
 src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java b/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java
index bd11e1e..a80d1ef 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/mapper/ContractEntrustOrderEntityMapper.java
@@ -24,6 +24,7 @@
     @Mapping(source = "entrustPrice", target = "entrustOpeningPrice")
     @Mapping(source = "createTime", target = "entrustTime")
     @Mapping(source = "entrustAmount", target = "prePaymentAmount")
+    @Mapping(source = "entrustType", target = "orderType")
     public abstract ContractOrderEntity entrustOrderToOrder(ContractEntrustOrderEntity orderEntity);
 
     @Mapping(source = "createTime", target = "entrustTime")

--
Gitblit v1.9.1