Merge remote-tracking branch 'origin/master'

yujian

2019-05-14 e57271b299b6568fd00e8046b79befbb1f224d2c

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java

@@ -49,4 +49,7 @@
    */

   String getUserSpreadImg(Long uid, String bgImg, int erCodePostionX, int erCodePostionY, int erCodeSize);



	
   String getInviteImg(Long uid, String bgImg, String inviteCode) throws Exception;



}