Merge remote-tracking branch 'origin/master'

admin

2019-02-26 9db53b847ba90d437d9545485416f23887adf934

 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++;// 计算欢迎语的数量