From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java
index c69d01e..154ca5e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java
@@ -17,4 +17,10 @@
 	 * @return
 	 */
 	List<UserTaoLiJinReport> needUpdateReport();
+	
+	/**
+	 * 閫�鍥炴湭棰嗗彇鐨勬窐绀奸噾
+	 * @return
+	 */
+	List<UserTaoLiJinReport> refundNotWin();
 }
\ No newline at end of file

--
Gitblit v1.8.0