From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Tue, 10 Oct 2023 10:59:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa --- screen-api/src/main/java/com/moral/api/controller/DictController.java | 2 ++ 1 files changed, 2 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..0c7cc2a 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,8 @@ .setInvestigationEnum(InvestigationEnum.values()) .setYesOrNo(YesOrNo.values()) .setFileTableEnum(FileTableEnum.values()) + .setAllocationApproveEnum(AllocationApproveEnum.values()) + .setAllocationExtensionApproveEnum(AllocationExtensionApproveEnum.values()) ; return ResultMessage.ok(dictionaryVo); } -- Gitblit v1.8.0