Merge branch 'div1'

yujian

2019-01-14 79ceb6d830499561abc1e86d976ca10ccd1fd7ed

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

@@ -263,7 +263,7 @@
      minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));



      // 本月未到账

      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));

      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));



      // 全部未到账

      minDate = new Date(0);