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

admin

2019-12-18 84ab5704aee0df06d0352ab67d1fa671ac284c8b

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

@@ -631,7 +631,9 @@
            welfareCenterNews = userInfoExtra.getCouponNews();

         }



         if (userInfoExtra.getInviteCode() != null && userInfoExtra.getInviteCode().trim().length() > 0) {

         if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) {

            invitCode = userInfoExtra.getInviteCodeVip();

         } else {

            invitCode = userInfoExtra.getInviteCode();

         }

      }