From 5e733773930587131c441ba545f70bf6d77c3051 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 16 Jul 2021 17:10:53 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
index 5f1d487..a6d127e 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
@@ -65,12 +65,16 @@
 
     List<DistribDataListVo> distribDataList(@Param("record")DistribDataListDto distribDataListDto);
 
-    String selectOrderByHeadUserId(@Param("accountId")String accountId);
+    String selectOrderByHeadUserId(@Param("accountId")String accountId,@Param("record")DistribDataListDto distribDataListDto);
 
-    String selectJDSLByHeadUserId(@Param("accountId")String id);
+    String selectJDSLByHeadUserId(@Param("accountId")String id,@Param("record")DistribDataListDto distribDataListDto);
 
     DistribDataInfoVo selectDistribDataInfoVo();
 
     List<DistribDataListVo> distribDataExport(@Param("record")ExportDistribDataListDto distribDataListDto);
+
+    String selectOrderExportByHeadUserId(@Param("accountId")String id, @Param("record")ExportDistribDataListDto distribDataListDto);
+
+    String selectJDSLExportByHeadUserId(@Param("accountId")String id, @Param("record")ExportDistribDataListDto distribDataListDto);
 }
 

--
Gitblit v1.9.1