From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/controller/DictController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/DictController.java b/screen-api/src/main/java/com/moral/api/controller/DictController.java
index 2d698e1..9aaf46b 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DictController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DictController.java
@@ -30,6 +30,9 @@
.setInvestigationEnum(InvestigationEnum.values())
.setYesOrNo(YesOrNo.values())
.setFileTableEnum(FileTableEnum.values())
+ .setAllocationApproveEnum(AllocationApproveEnum.values())
+ .setAllocationExtensionApproveEnum(AllocationExtensionApproveEnum.values())
+ .setEmphasisEnum(EmphasisEnum.values())
;
return ResultMessage.ok(dictionaryVo);
}
--
Gitblit v1.8.0