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

yujian

2019-07-31 617312cbc114c6ac38c8eb4a8bcda583c33dd72f

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

@@ -62,5 +62,5 @@
    * @return

    * @throws IOException

    */

   public String drawInviteQrCodeNew(String url, Long uid, String portrait, String inviteCode) throws IOException;

   public String drawInviteQrCodeNew(String url, Long uid, String portrait, Integer pX, Integer pY, Integer size, String inviteCode) throws IOException;

}