Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

6 天以前 61fef835f616f70ca35e1f046cdda82d6b68bfdc

 src/main/java/com/ruoyi/common/utils/EnumUtil.java

@@ -73,7 +73,7 @@
        return Arrays.stream(enumClass.getEnumConstants())
                .map(e -> {
                    Map<String, Object> map = new HashMap<>();
                    map.put("key", e.getCode());
                    map.put("key", e.getCode().toString());
                    map.put("value", e.getValue());
                    return map;
                })