From 317c35511315bc5990ae72dc1cd72e6feb9651c8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 10 一月 2019 15:13:21 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractAuditRecordService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractAuditRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractAuditRecordService.java
index 50f47d1..eb53513 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractAuditRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/ExtractAuditRecordService.java
@@ -121,8 +121,9 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<Map<String, Object>> countAuditTotal(Integer state, Integer type, String years, String startTime,
+	public List<Map<String, Object>>countAuditTotal(Integer state, Integer type, String years, String startTime,
 			String endTime) throws Exception;
+	
 	
 	
 	/**
@@ -134,7 +135,7 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<Map<String, Object>> countExtractMoney(Integer state, Integer type, String years, String startTime,
+	public List<Map<String, Object>> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
 			String endTime) throws Exception;
 
 	/**
@@ -150,4 +151,5 @@
 			String endTime) throws Exception;
 	
 	
+	
 }

--
Gitblit v1.8.0