From 97e4f5c460d37ae3eb9c03396dd9dd6bb3f970cd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 22 十一月 2023 11:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java | 10 +++++++++-
1 files changed, 9 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 e324fcf..3bcb84a 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
@@ -25,7 +25,7 @@
/** 瀛楀吀鍚嶇О */
@Excel(name = "瀛楀吀鍚嶇О")
private String dictName;
-
+ private String dictNameI18n;
/** 瀛楀吀绫诲瀷 */
@Excel(name = "瀛楀吀绫诲瀷")
private String dictType;
@@ -56,6 +56,14 @@
this.dictName = dictName;
}
+ public String getDictNameI18n() {
+ return dictNameI18n;
+ }
+
+ public void setDictNameI18n(String dictNameI18n) {
+ this.dictNameI18n = dictNameI18n;
+ }
+
@NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "瀛楀吀绫诲瀷蹇呴』浠ュ瓧姣嶅紑澶达紝涓斿彧鑳戒负锛堝皬鍐欏瓧姣嶏紝鏁板瓧锛屼笅婊戠嚎锛�")
--
Gitblit v1.9.3