From 239df6b32472882b4bd74fe97d9cc589c4f39baf Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 15 八月 2021 12:25:47 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java
index 6fd59b4..a7bb4e7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActUserWalletTradeMapper.java
@@ -6,6 +6,7 @@
 import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
 import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
 import com.panzhihua.common.model.vos.community.ComActUserWalletTradeExcelVO;
+import com.panzhihua.common.model.vos.community.ComActUserWalletTradeRewardExcelVO;
 import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeAdminVO;
 import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeStatisticsAdminVO;
 import com.panzhihua.common.model.vos.community.wallet.ComActWalletTradeVO;
@@ -48,5 +49,7 @@
 
     List<ComActUserWalletTradeExcelVO> getTradeUserTotalWalletTradeExportAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);
 
+    List<ComActUserWalletTradeRewardExcelVO> getTradeUserTotalJLWalletTradeExportAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);
+
     ComActWalletTradeStatisticsAdminVO getTradeUserStatisticsAdmin(@Param("walletTradeDTO") PageComActWalletTradeAdminDTO pageTradeAdminDTO);
 }

--
Gitblit v1.7.1