Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-01 ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc

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

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

    * @throws Exception

    */

   String getInviteImg(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;



   /**

    * 邀请图片 问候