From 3b6003746188070e094c1d04d7709afa7d72eb42 Mon Sep 17 00:00:00 2001 From: hshansha Date: Tue, 27 May 2025 11:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E3=80=81=E5=BA=94=E5=87=BA?= =?UTF-8?q?=E5=8B=A4=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/pay/domain/bo/PayButieBo.java | 6 +++--- .../bo/PayRequireAttendanceReportBo.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayButieBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayButieBo.java index 1f6c7f3..7ca8cf1 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayButieBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayButieBo.java @@ -24,7 +24,7 @@ public class PayButieBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + // @NotNull(message = "主键不能为空", groups = { EditGroup.class }) private Long id; /** @@ -54,13 +54,13 @@ public class PayButieBo extends BaseEntity { /** * 删除标志(0-可用 1-删除) */ - @NotNull(message = "删除标志(0-可用 1-删除)不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "删除标志(0-可用 1-删除)不能为空", groups = { AddGroup.class, EditGroup.class }) private Integer deleted; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; diff --git a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayRequireAttendanceReportBo.java b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayRequireAttendanceReportBo.java index a0d0734..ca0a8b9 100644 --- a/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayRequireAttendanceReportBo.java +++ b/ruoyi-pay/src/main/java/com/ruoyi/pay/domain/bo/PayRequireAttendanceReportBo.java @@ -25,7 +25,7 @@ public class PayRequireAttendanceReportBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + // @NotNull(message = "主键不能为空", groups = { EditGroup.class }) private Long id; /** @@ -67,7 +67,7 @@ public class PayRequireAttendanceReportBo extends BaseEntity { /** * 休息类别 */ - @NotBlank(message = "休息类别不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "休息类别不能为空", groups = { AddGroup.class, EditGroup.class }) private String restType; /** @@ -85,37 +85,37 @@ public class PayRequireAttendanceReportBo extends BaseEntity { /** * 出勤小时数 */ - @NotNull(message = "出勤小时数不能为空", groups = { AddGroup.class, EditGroup.class }) + //@NotNull(message = "出勤小时数不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal attendanceHours; /** * 加班小时数 */ - @NotNull(message = "加班小时数不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "加班小时数不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal overtimeHours; /** * 放假天数 */ - @NotNull(message = "放假天数不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "放假天数不能为空", groups = { AddGroup.class, EditGroup.class }) private Long holidays; /** * 放假小时数 */ - @NotNull(message = "放假小时数不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "放假小时数不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal holidayHours; /** - * + * */ - @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal leaveDays; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark;