merge master

src/components/Tinymce/index.vue

@@ -8,6 +8,10 @@
 </template>
 
 <script>
+/**
+ * docs:
+ * https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
+ */
 import editorImage from './components/EditorImage'
 import plugins from './plugins'
 import toolbar from './toolbar'