From 7e25a80c5bcb45ed9524a57e24bcabd0a0db625d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 24 四月 2022 11:46:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/package.json | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 2 ++
2 files changed, 3 insertions(+), 1 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 082a5be..942c2f9 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
@@ -14,6 +14,7 @@
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
/**
@@ -53,6 +54,7 @@
@ExcelProperty(value = "瀛楀吀绫诲瀷")
@NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "瀛楀吀绫诲瀷蹇呴』浠ュ瓧姣嶅紑澶达紝涓斿彧鑳戒负锛堝皬鍐欏瓧姣嶏紝鏁板瓧锛屼笅婊戠嚎锛�")
private String dictType;
/**
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index e558353..42b3895 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -41,7 +41,7 @@
"clipboard": "2.0.8",
"core-js": "3.19.1",
"echarts": "4.9.0",
- "element-ui": "2.15.6",
+ "element-ui": "2.15.8",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
--
Gitblit v1.9.3