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

疯狂的狮子li

2021-09-14 662251e208e58a9940efb200457c49ed342cd06f

 ruoyi-ui/src/components/Editor/index.vue

@@ -180,7 +180,7 @@
        // 调整光标到最后
        quill.setSelection(length + 1);
      } else {
        this.$message.error("图片插入失败");
        this.$message.error(res.msg);
      }
    },
    handleUploadError() {