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/ContractHoldOrderEntityMapper.java |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java
index 1c94218..d0cafed 100644
--- a/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java
+++ b/src/main/java/com/xcong/excoin/modules/trademanage/mapper/ContractHoldOrderEntityMapper.java
@@ -1,14 +1,20 @@
-package com.xcong.excoin.modules.trademanage.mapper;
-
-import org.apache.ibatis.annotations.Param;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
-
-public interface ContractHoldOrderEntityMapper extends BaseMapper<ContractHoldOrderEntity> {
-
-    IPage<ContractHoldOrderEntity> selectContractHoldOrderListInPage(Page<ContractHoldOrderEntity> page,
-			@Param("record") ContractHoldOrderEntity contractHoldOrderEntity);
-    
-}
+package com.xcong.excoin.modules.trademanage.mapper;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xcong.excoin.modules.trademanage.entity.ContractHoldOrderEntity;
+
+public interface ContractHoldOrderEntityMapper extends BaseMapper<ContractHoldOrderEntity> {
+
+    IPage<ContractHoldOrderEntity> selectContractHoldOrderListInPage(Page<ContractHoldOrderEntity> page,
+			@Param("record") ContractHoldOrderEntity contractHoldOrderEntity);
+
+	IPage<ContractHoldOrderEntity> findContractHoldOrderAloneInPage(Page<ContractHoldOrderEntity> page,
+			@Param("record") ContractHoldOrderEntity contractHoldOrderEntity);
+
+	IPage<ContractHoldOrderEntity> findContractHoldOrderAloneTestInPage(Page<ContractHoldOrderEntity> page,
+			@Param("record")ContractHoldOrderEntity contractHoldOrderEntity);
+    
+}

--
Gitblit v1.9.1