Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordErrorServiceImpl.java

@@ -171,7 +171,6 @@ public class AttendanceRecordErrorServiceImpl extends AbstractCRUDServiceImpl<At
 
                 }
             }
-            // }
         }
         log.info("从新生成已处理的绩效考勤核查数据,执行完成.....");
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java

@@ -246,7 +246,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
         recordEntity.setDeductPerson("系统管理员");
-        recordEntity.setDeductTime(new Date());
+        recordEntity.setDeductTime(req.getErrorTime());
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         recordEntity.setWorkNum(staffEntity.getWorkNum());