Merge remote-tracking branch 'origin/div' into div

admin

2019-09-23 ee582a5d091966cf2324653c53a7553623e09730

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

@@ -58,7 +58,7 @@
    * @return

    * @throws Exception

    */

   String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, String inviteCode) throws Exception;

   String drawInviteQrCodeNew(String bgImg, Long uid, String portrait, Integer pX, Integer pY, Integer size, String inviteCode) throws Exception;



   /**

    * 邀请图片 问候