From 6b12faed50dda2d32c4dc2e60db59aaa721d7813 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 17:30:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java
index 58a9711..f29e2a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinReportServiceImpl.java
@@ -171,7 +171,7 @@
 	
 	@Override
 	public UserTaoLiJinReport selectByPrimaryKey(String id) {
-		return userTaoLiJinReportMapper.selectByPrimaryKey(id);
+		return userTaoLiJinReportMapper.selectByPrimaryKeyStr(id);
 	}
 	
 }

--
Gitblit v1.8.0