Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java

@@ -196,7 +196,7 @@
         

         for (UserTaoLiJinGiveRecord record: overdueList) {

            try {

               userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record.getAmount());

               userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record);

               // 更新记录

               UserTaoLiJinGiveRecord updateRecord = new UserTaoLiJinGiveRecord();

               updateRecord.setId(record.getId());