From cafaa48f09ae31316c0963b56856e96d1e513ffb Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 1 Mar 2022 20:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=8A=A0=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8(?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/common/system/vo/DictModel.java   | 9 +++++++--
 .../modules/system/service/impl/SysDictServiceImpl.java  | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java
index dfd5dfa65..f73530275 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java
@@ -17,12 +17,12 @@ public class DictModel implements Serializable{
 
 	public DictModel() {
 	}
-	
+
 	public DictModel(String value, String text) {
 		this.value = value;
 		this.text = text;
 	}
-	
+
 	/**
 	 * 字典value
 	 */
@@ -32,6 +32,11 @@ public class DictModel implements Serializable{
 	 */
 	private String text;
 
+	/**
+	 * 字典文本
+	 */
+	private String textEn;
+
 	/**
 	 * 特殊用途： JgEditableTable
 	 * @return
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
index 59cd37496..8f200416b 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
@@ -78,6 +78,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 			List<DictModel> dictModelList = sysDictItemList.stream().filter(s -> d.getId().equals(s.getDictId())).map(item -> {
 				DictModel dictModel = new DictModel();
 				dictModel.setText(item.getItemText());
+				dictModel.setTextEn(item.getEnName());
 				dictModel.setValue(item.getItemValue());
 				return dictModel;
 			}).collect(Collectors.toList());