From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
index 36601e3..ff060aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
@@ -76,4 +76,15 @@
 	public BigDecimal statisticUserTypeMoneyWithDate(Long uid, List<UserMoneyDetailTypeEnum> typeList, Date minDate,
 			Date maxDate);
 
+	/**
+	 * 鏍规嵁绫诲瀷锛岀敤鎴稩D涓庡敮涓�鏍囪瘑绗︽煡璇�
+	 * 
+	 * @param type
+	 * @param uid
+	 * @param sourceIdentifyId
+	 * @return
+	 */
+	public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,
+			Long sourceIdentifyId);
+
 }

--
Gitblit v1.8.0