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

admin

2020-02-23 121c5ee5345d366ae4aadf7901af9b0678dbb7a8

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

@@ -89,4 +89,6 @@
    * @return

    */

   public FileUploadResult drawGoodsPosterXCX(InputStream erCodeStream, UserInfo user, GoodsDetailVO goods);


   public FileUploadResult drawDynamicGoodsPoster(String erCodeUrl, String portrait, String inviteCode, GoodsDetailVO goods);
}