diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java index 39ed6fad..dfd74ee4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCpPlanController.java @@ -80,7 +80,8 @@ public class AppEnfCpPlanController extends EfcodeCpPlanController { */ @GetMapping("/reserve/check/{targetPlanId}") public R checkCanReserve(@PathVariable String targetPlanId) { - return cpReserveService.checkCanReserve(targetPlanId); + cpReserveService.checkCanReserve(targetPlanId); + return R.ok(); } /** diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java index 51e826f0..700d33e6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/NonEnforcementRegistration.java @@ -16,9 +16,9 @@ import java.io.Serial; * @date 2026-05-19 */ @Data -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode(callSuper = false) @TableName("non_enforcement_registration") -public class NonEnforcementRegistration extends BaseEntity { +public class NonEnforcementRegistration { @Serial private static final long serialVersionUID = 1L; @@ -184,5 +184,7 @@ public class NonEnforcementRegistration extends BaseEntity { */ private String reason; + private String createBy; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java index f823ece5..ffdfef88 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/NonEnforcementRegistrationVo.java @@ -233,4 +233,5 @@ public class NonEnforcementRegistrationVo implements Serializable { */ private String area; + private String createBy; }