Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

 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);
    }