From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 dc6ff19..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,9 +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) {
@@ -68,5 +69,13 @@
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