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

疯狂的狮子li

2020-10-10 bd39b971cf9fbecdc3086f4ef75a37291b98505d

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

@@ -114,7 +114,7 @@
</script>

<style>
.editor {
.editor, .ql-toolbar {
  white-space: pre-wrap!important;
  line-height: normal !important;
}