From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 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