From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001 From: cjl <909710561@qq.com> Date: Mon, 06 Jan 2025 09:19:24 +0800 Subject: [PATCH] Merge branch 'cjl' 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