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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java

@@ -33,7 +33,11 @@
    private List<Map<String, Object>> ChangeEnum;
    private List<Map<String, Object>> YesOrNo;

    private List<Map<String, Object>> AllocationApproveEnum;
    private List<Map<String, Object>> FileTableEnum;

    private List<Map<String, Object>> AllocationExtensionApproveEnum;
    private List<Map<String, Object>> EmphasisEnum;


    public static List<Map<String, Object>> enumArray2Map(Enum[] enums) {
@@ -62,5 +66,21 @@
        return this;
    }

    public DictionaryVo setFileTableEnum(com.moral.api.pojo.enums.FileTableEnum[] enumResult) {
        this.FileTableEnum = enumArray2Map(enumResult);
        return this;
    }
    public DictionaryVo setAllocationApproveEnum(com.moral.api.pojo.enums.AllocationApproveEnum[] enumResult) {
        this.AllocationApproveEnum = enumArray2Map(enumResult);
        return this;
    }
    public DictionaryVo setAllocationExtensionApproveEnum(com.moral.api.pojo.enums.AllocationExtensionApproveEnum[] enumResult) {
        this.AllocationExtensionApproveEnum = enumArray2Map(enumResult);
        return this;
    }
    public DictionaryVo setEmphasisEnum(com.moral.api.pojo.enums.EmphasisEnum[] enumResult) {
        this.EmphasisEnum = enumArray2Map(enumResult);
        return this;
    }

}