Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

 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;

}