From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java
index 3ab2631..dc1ba3b 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/GbzOrderDao.java
@@ -10,7 +10,7 @@
public interface GbzOrderDao extends BaseMapper<GbzOrderEntity> {
- IPage<GbzOrderEntity> selectInPage(Page<GbzOrderEntity> page);
+ IPage<GbzOrderEntity> selectInPage(@Param("record") GbzOrderEntity gbzOrderEntity, Page<GbzOrderEntity> page);
BigDecimal selectOrderTotalAmount(@Param("memberId") Long memberId);
--
Gitblit v1.9.1