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

admin

2020-06-16 2886d5a6eee762ad7b776e930fc49b01fb64dd5e

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -314,6 +314,14 @@
         } else {

            userInfoVO.setBossName("上级：" + boss.getNickName());

         }

			
         // 微信号

         String wxId = userInfoVO.getWxId();

         if (StringUtil.isNullOrEmpty(wxId)) {

            userInfoVO.setWxId("");

         } else {

            userInfoVO.setWxId("微信号:" + wxId);

         }

      }



      return userList;