From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/controller/DictController.java | 1 +
1 files changed, 1 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 0c7cc2a..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
@@ -32,6 +32,7 @@
.setFileTableEnum(FileTableEnum.values())
.setAllocationApproveEnum(AllocationApproveEnum.values())
.setAllocationExtensionApproveEnum(AllocationExtensionApproveEnum.values())
+ .setEmphasisEnum(EmphasisEnum.values())
;
return ResultMessage.ok(dictionaryVo);
}
--
Gitblit v1.8.0