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

hsy

4 天以前 5a90852489e1bf91d386746d75cfa0066c271228

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