From 5eb88939c094fac1f5dc9201b5af6da4165cc185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:36:34 +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