From 3cc8d1cc3662d88fe7f3666fb1f99e1b19411424 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期一, 14 七月 2025 16:59:58 +0800 Subject: [PATCH] 新功能加问题修复 --- multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java index 49d1825..b23557b 100644 --- a/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java +++ b/multi-common/src/main/java/com/gkhy/exam/common/domain/entity/SysUser.java @@ -52,20 +52,35 @@ private String name; @NotNull(message = "用户类型不能为空") - @ApiModelProperty(value = "用户类型(0系统用户,1企业级用户,2部门级用户,3车间级(岗位)级,4其他,默认0)",required = true) + @ApiModelProperty(value = "用户类型(0系统用户,1企业级用户,2部门级用户,3车间级(岗位)级,4其他,默认0,6企业管理员)",required = true) @TableField("user_type") private Integer userType; - @NotBlank(message = "手机号码不能为空") - @Length(min = 11, max = 11, message = "手机号只能为11位") - @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误!") - @ApiModelProperty(value = "手机号码",required = true) +// @NotBlank(message = "手机号码不能为空") +// @Length(min = 11, max = 11, message = "手机号只能为11位") +// @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$",message = "手机号码有误!") + @ApiModelProperty(value = "手机号码",required = false) @TableField("phone") private String phone; @ApiModelProperty("用户性别(0男,1女,2未知,默认2)") @TableField("sex") private Integer sex; + + @ApiModelProperty(value = "用户年龄",required = true) + @NotNull(message = "年龄不能为空") + @TableField("age") + private Integer age; + + @ApiModelProperty(value = "人员类别1技术2管理",required = true) + @NotNull(message = "人员类别1技术2管理") + @TableField("person_type") + private Integer personType; + + @NotBlank(message = "职称不能为空") + @ApiModelProperty("职称") + @TableField("positional") + private String positional; @ApiModelProperty("父级账号id") @TableField("parent_id") @@ -130,6 +145,10 @@ @TableField("entry_time") private LocalDate entryTime; + @ApiModelProperty("离职时间") + @TableField("resign_time") + private LocalDate resignTime; + @ApiModelProperty("公司名称") @TableField(exist = false) private String companyName; -- Gitblit v1.9.2