From 1b3493d7ff97fd0d3474b12f9a6a435693e124fa Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 21 五月 2019 14:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
index 841c1d6..0c73929 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/SpreadUserImgServiceImpl.java
@@ -252,8 +252,8 @@
 
 	
 	@Override
-	public String getInviteImg(String bgImg, Long uid, String portrait, String inviteCode) throws Exception {
-		return qrCodeService.drawInviteQrCode(bgImg, uid, portrait, inviteCode);
+	public String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, String inviteCode) throws Exception {
+		return qrCodeService.drawInviteQrCodeNew(bgImg, uid, portrait, inviteCode);
 	}
 	
 	

--
Gitblit v1.8.0