From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak

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