Merge remote-tracking branch 'origin/div' into div

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 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());