diff --git a/.gitea/config.yaml b/.gitea/config.yaml index 03687bc..3e4aa74 100644 --- a/.gitea/config.yaml +++ b/.gitea/config.yaml @@ -7,11 +7,11 @@ # 总开关:false 时跳过 class_check + api_check,流水线直接退出 checker: - enabled: false + enabled: true # 类变更检测(Vo/Dto/Entity/Model 字段增删改等) class_check: - enabled: true + enabled: false dto_entity_conversion: enabled: false 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 aa0b31c..8bdcc28 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 @@ -192,7 +192,7 @@ public class ApplyClockInController { * @param applyAttendanceOutsideDto 表单对象 * @return java.lang.Object */ - @PostMapping("/outside") + @PostMapping("/outside1") public Object create(@RequestBody @Valid ApplyAttendanceOutsideDto applyAttendanceOutsideDto) { if (StringUtil.isNotEmpty(applyAttendanceOutsideDto.getSpecialBusinessId())) { applyAttendanceOutsideDto.setClockInId(applyAttendanceOutsideDto.getSpecialBusinessId()); 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 c74f1ec..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,7 +17,7 @@ import java.util.List; public class ApplyAttendanceOutsideDto { /** 审批id */ - private String taskId; + private Integer taskId; /** 流程标题 */ private String flowTitle; /** 申请人id */