Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 6381bb6b6422c23ee4801895019f1a432903fbe8

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -247,7 +247,7 @@
    @ApiOperation("富文本转html")
    @PostMapping("/htmlContent")
    public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
        log.error("htmlContentVO入参为：{}", htmlContentVO);
        log.info("htmlContentVO入参为：{}", htmlContentVO);
        // 获取文件的原始名称
        String fileName = htmlContentVO.getFileName();
        if (!fileName.endsWith(".html")) {