diff --git a/jnpf-ftb/jnpf-ftb-biz/src/main/java/jnpf/workflow/controller/ApplyClockInController.java b/jnpf-ftb/jnpf-ftb-biz/src/main/java/jnpf/workflow/controller/ApplyClockInController.java index 974cce8..edaffc9 100644 --- a/jnpf-ftb/jnpf-ftb-biz/src/main/java/jnpf/workflow/controller/ApplyClockInController.java +++ b/jnpf-ftb/jnpf-ftb-biz/src/main/java/jnpf/workflow/controller/ApplyClockInController.java @@ -259,7 +259,7 @@ public class ApplyClockInController { * 获取打卡类型 * @return jnpf.base.ActionResult> */ - @GetMapping(value = "/violation/clock-kind") + @GetMapping(value = "/violation/clock-kind1") public ActionResult> getClockKindList() { List list = List.of(new ClockKindVo(1, "内勤打卡"), new ClockKindVo(2, "外勤打卡")); 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 a455f4a..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 @@ -18,8 +18,6 @@ public class ApplyAttendanceOutsideDto { /** 审批id */ private Integer taskId; - /** 审批人 */ - private String person; /** 流程标题 */ private String flowTitle; /** 申请人id */