Merge branch 'div'

yujian

2019-02-25 4e850902b0caab3c4a5ea10855c484f13025e038

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java

@@ -416,7 +416,7 @@
         volist.add(vo);

      }



      Long time = userInfoService.getUserById(uid).getCreatetime();

      Long time = userInfoService.selectByPKey(uid).getCreatetime();

      if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))

         count++;// 计算欢迎语的数量