Merge remote-tracking branch 'origin/master'

admin

2019-03-19 39d967a45c6b9834e943e670e8d8ea15b505beb1

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

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

      }



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

      Long time = System.currentTimeMillis();//userInfoService.selectByPKey(uid).getCreatetime();

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

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