From f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 14:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java
index dacd8de..efe26ca 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java
@@ -37,6 +37,7 @@
private List<Map<String, Object>> FileTableEnum;
private List<Map<String, Object>> AllocationExtensionApproveEnum;
+ private List<Map<String, Object>> EmphasisEnum;
public static List<Map<String, Object>> enumArray2Map(Enum[] enums) {
@@ -77,5 +78,9 @@
this.AllocationExtensionApproveEnum = enumArray2Map(enumResult);
return this;
}
+ public DictionaryVo setEmphasisEnum(com.moral.api.pojo.enums.EmphasisEnum[] enumResult) {
+ this.EmphasisEnum = enumArray2Map(enumResult);
+ return this;
+ }
}
--
Gitblit v1.8.0