补贴、应出勤必填项修改

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;
 
 

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;