diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserCertificate.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserCertificate.java index a2dead2ca..4a9b549f6 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserCertificate.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUserCertificate.java @@ -68,6 +68,13 @@ public class SysUserCertificate extends BaseEntity { @ChineseDescription("证书到期日期,如果为空,则为长期") private Date dateExpires; + /** + * 附件id + */ + @TableField("attachment_id") + @ChineseDescription("附件id") + private Long attachmentId; + /** * 删除标记:Y-已删除,N-未删除 */ diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserCertificateRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserCertificateRequest.java index 9bfe4c37b..201f4a873 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserCertificateRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/request/SysUserCertificateRequest.java @@ -5,9 +5,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.util.List; /** * 用户证书封装类 @@ -56,27 +54,18 @@ public class SysUserCertificateRequest extends BaseRequest { * 证书发证日期 */ @ChineseDescription("证书发证日期") - private String dateIssued; + private String dateIssued; /** * 证书到期日期,如果为空,则为长期 */ @ChineseDescription("证书到期日期,如果为空,则为长期") - private String dateExpires; + private String dateExpires; /** - * 是否删除:Y-删除,N-未删除 + * 附件id */ - @NotBlank(message = "是否删除:Y-删除,N-未删除不能为空", groups = {add.class, edit.class}) - @ChineseDescription("是否删除:Y-删除,N-未删除") - private String delFlag; - - - /** - * 批量删除用的id集合 - */ - @NotNull(message = "批量删除id集合不能为空", groups = batchDelete.class) - @ChineseDescription("批量删除用的id集合") - private List batchDeleteIdList; + @ChineseDescription("附件id") + private Long attachmentId; }