Conflicts: ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java ruoyi-ui/src/components/Editor/index.vue