Merge remote-tracking branch 'origin/dev' into cjl

cjl

2023-11-10 0920f23406e52e4c7149515797a317c836c9e065

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