Merge remote-tracking branch 'origin/master'

admin

2019-01-28 e52789b7e099f6e8f10543afbc4f9010b5e94e1a

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

@@ -96,7 +96,7 @@
      }



      if (list != null) {

         if (userMoneyDetailId != null&&list.size()>0) {

         if (userMoneyDetailId != null && list.size() > 0) {

            UserMoneyDetail umd = userMoneyDetailMapper.selectByPrimaryKey(userMoneyDetailId);

            if (!TimeUtil.getGernalTime(umd.getCreateTime().getTime(), "yyyy-MM")

                  .equalsIgnoreCase(TimeUtil.getGernalTime(list.get(0).getCreateTime().getTime(), "yyyy-MM"))) {