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

admin

2020-01-08 be641cbe14bf20c807dccceb1c4b825d80443aed

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -435,7 +435,7 @@
            form.setWxName(xinUser.getNickname());

            String wxHeadImg = COSManager.getInstance()

                  .uploadFile(HttpUtil.getAsInputStream(xinUser.getHeadimgurl()),

                        Constant.WXHEADURL + UUID.randomUUID().toString())

                        FilePathEnum.userPortrait + UUID.randomUUID().toString())

                  .getUrl();

            form.setWxPic(wxHeadImg);

         } else if (formLoginType == Constant.TAOBAO) {