Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -52,4 +52,15 @@
    */

   public String drawInviteToGreet(String url, Long uid, String portrait, String inviteCode, String content, Date date)

         throws IOException;



   /**

    * uid为空时  默认官方

    * @param url

    * @param uid

    * @param portrait

    * @param inviteCode

    * @return

    * @throws IOException

    */

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

}