From fb89f40499211dae5d74caf3cea2ea696745e7a2 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java | 15 +++++++++++++++
1 files changed, 15 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 e1874dc..dacd8de 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
@@ -33,7 +33,10 @@
private List<Map<String, Object>> ChangeEnum;
private List<Map<String, Object>> YesOrNo;
+ private List<Map<String, Object>> AllocationApproveEnum;
+ private List<Map<String, Object>> FileTableEnum;
+ private List<Map<String, Object>> AllocationExtensionApproveEnum;
public static List<Map<String, Object>> enumArray2Map(Enum[] enums) {
@@ -62,5 +65,17 @@
return this;
}
+ public DictionaryVo setFileTableEnum(com.moral.api.pojo.enums.FileTableEnum[] enumResult) {
+ this.FileTableEnum = enumArray2Map(enumResult);
+ return this;
+ }
+ public DictionaryVo setAllocationApproveEnum(com.moral.api.pojo.enums.AllocationApproveEnum[] enumResult) {
+ this.AllocationApproveEnum = enumArray2Map(enumResult);
+ return this;
+ }
+ public DictionaryVo setAllocationExtensionApproveEnum(com.moral.api.pojo.enums.AllocationExtensionApproveEnum[] enumResult) {
+ this.AllocationExtensionApproveEnum = enumArray2Map(enumResult);
+ return this;
+ }
}
--
Gitblit v1.8.0