From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinReportMapper.java |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 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..224fb45 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
@@ -1,20 +1,26 @@
-package com.yeshi.fanli.dao.mybatis.tlj;
-
-import java.util.List;
-
-import com.yeshi.fanli.dao.BaseMapper;
-import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
-
-public interface UserTaoLiJinReportMapper extends BaseMapper<UserTaoLiJinReport> {
-	
-	int deleteByPrimaryKey(String id);
-
-	UserTaoLiJinReport selectByPrimaryKey(String id);
-
-	
-	/**
-	 * 鏌ヨ鏇存柊鐨勬姤鍛�
-	 * @return
-	 */
-	List<UserTaoLiJinReport> needUpdateReport();
+package com.yeshi.fanli.dao.mybatis.tlj;
+
+import java.util.List;
+
+import com.yeshi.fanli.dao.BaseMapper;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
+
+public interface UserTaoLiJinReportMapper extends BaseMapper<UserTaoLiJinReport> {
+	
+	int deleteByPrimaryKey(String id);
+
+	UserTaoLiJinReport selectByPrimaryKeyStr(String id);
+
+	
+	/**
+	 * 鏌ヨ鏇存柊鐨勬姤鍛�
+	 * @return
+	 */
+	List<UserTaoLiJinReport> needUpdateReport();
+	
+	/**
+	 * 閫�鍥炴湭棰嗗彇鐨勬窐绀奸噾
+	 * @return
+	 */
+	List<UserTaoLiJinReport> refundNotWin();
 }
\ No newline at end of file

--
Gitblit v1.8.0