From a0447de0612b8895b6052f26c4ff46e9033fcffc Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 15 Apr 2022 09:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E4=BB=A5=E5=AD=97=E6=AF=8D=E5=BC=80=E5=A4=B4=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E5=8F=AA=E8=83=BD=E4=B8=BA=EF=BC=88=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E5=AD=97=E6=AF=8D=EF=BC=8C=E6=95=B0=E5=AD=97=EF=BC=8C=E4=B8=8B?= =?UTF-8?q?=E6=BB=91=E7=BA=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/core/domain/entity/SysDictType.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 027c6e95..0befbf43 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -1,7 +1,7 @@ package com.ruoyi.common.core.domain.entity; -import javax.validation.constraints.Pattern; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -27,9 +27,6 @@ public class SysDictType extends BaseEntity private String dictName; /** 字典类型 */ - @NotBlank(message = "字典类型不能为空") - @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成") - @Size(min = 2, max = 200, message = "字典类型长度必须在2-200个字符之间") @Excel(name = "字典类型") private String dictType; @@ -61,6 +58,7 @@ public class SysDictType extends BaseEntity @NotBlank(message = "字典类型不能为空") @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") + @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") public String getDictType() { return dictType;