Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-08-17 def437722600ecea0a45a305c64ca70c0a6cf486

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

@@ -66,7 +66,6 @@
      content: this.value,
      uploadImgUrl: "",
      editorOption: {
        placeholder: "",
        theme: "snow", // or 'bubble'
        placeholder: "请输入内容",
        modules: {
@@ -146,6 +145,7 @@

<style>
.editor {
  white-space: pre-wrap!important;
  line-height: normal !important;
  height: 192px;
}