diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java index 0dfc8c9..5c9f954 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.util.Date; @@ -85,7 +84,6 @@ public class SysTeacher extends TenantEntity { /** * 出生日期 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") private Date birthday; /** diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java index 4e9b66a..5acda28 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java @@ -1,15 +1,17 @@ package org.dromara.file.domain.bo; -import org.dromara.file.domain.SysTeacher; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.file.domain.SysTeacher; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 教职工信息业务对象 sys_teacher @@ -23,9 +25,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class SysTeacherBo extends BaseEntity { /** - * 教职工 + * 教职工ID */ - @NotNull(message = "教职工不能为空", groups = { EditGroup.class }) private Long teacherId; /** @@ -49,13 +50,11 @@ public class SysTeacherBo extends BaseEntity { /** * 工作号码 */ - @NotBlank(message = "工作号码不能为空", groups = { AddGroup.class, EditGroup.class }) private String telephone; /** * 用户邮箱 */ - @NotBlank(message = "用户邮箱不能为空", groups = { AddGroup.class, EditGroup.class }) private String email; /** @@ -91,7 +90,7 @@ public class SysTeacherBo extends BaseEntity { /** * 出生日期 */ - @NotNull(message = "出生日期不能为空", groups = { AddGroup.class, EditGroup.class }) + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date birthday;