From bb34b1893909ac35b9c36c2a87f7127901965d58 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 16 Nov 2020 21:16:34 +0800
Subject: [PATCH] Merge branches 'cpv-back' and 'roc-bak' of https://gitee.com/chonggaoxiao/new_excoin_manage into cpv-back

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

diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java
index 1082687..f480b25 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractOrderMapper.java
@@ -11,5 +11,14 @@
 
 	IPage<ContractOrderEntity> findMemberHistoryOrderInfoInPage(Page<ContractOrderEntity> page,
 			@Param("record") ContractOrderEntity contractOrderEntity);
+	
+	IPage<ContractOrderEntity> findMemberHistoryOrderInfoAllInPage(Page<ContractOrderEntity> page,
+			@Param("record") ContractOrderEntity contractOrderEntity);
+
+	IPage<ContractOrderEntity> findHistoryOrderInfoAloneInfoInPage(Page<ContractOrderEntity> page,
+			@Param("record") ContractOrderEntity contractOrderEntity);
+
+	IPage<ContractOrderEntity> findhistoryOrderInfoAloneTestInfoInPage(Page<ContractOrderEntity> page,
+			@Param("record")ContractOrderEntity contractOrderEntity);
 
 }

--
Gitblit v1.9.1