Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

2 小时以前 cb9cd49627b65a4c0e137e08063271a8cefe1826

 src/components/tinymce/editor.vue

@@ -15,8 +15,8 @@
  watch,
} from 'vue';

import { preferences, usePreferences } from '..\..\packages\preferences\src';
import { buildShortUUID, isNumber } from '..\..\packages\utils\src';
import { preferences, usePreferences } from '@vben/preferences';
import { buildShortUUID, isNumber } from '@vben/utils';

import Editor from '@tinymce/tinymce-vue';