diff --git a/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceChangeDto.java b/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceChangeDto.java index 670884d..0363ad2 100644 --- a/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceChangeDto.java +++ b/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceChangeDto.java @@ -35,8 +35,8 @@ public class ApplyAttendanceChangeDto { private Date offWorkTime; /** 变更类型(-1: 缺卡, 1: 正常, 2: 迟到, 3: 早退) */ private String changeType; - /** 变更分钟数统计 */ - private Integer changeMinutes; + /** 变更分钟数 */ + private String changeMinute; /** 变更类型 + 分钟数 */ private String[] changeData; /** 变更理由 */ diff --git a/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceOutsideDto.java b/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceOutsideDto.java index c31ec79..61dc0a7 100644 --- a/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceOutsideDto.java +++ b/jnpf-ftb/jnpf-ftb-entity/src/main/java/jnpf/model/workflow/dto/ApplyAttendanceOutsideDto.java @@ -17,9 +17,7 @@ import java.util.List; public class ApplyAttendanceOutsideDto { /** 审批id */ - private String taskId; - /** 流程主键 */ - private String flowId; + private Integer taskId; /** 流程标题 */ private String flowTitle; /** 申请人id */