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

疯狂的狮子li

2020-09-16 b111cbeedd41c8d07f8e3384a9a8536c0d178ea2

 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;
}