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

xiaoyi

7 天以前 cec91d13116154243b444fd950e59f628b355981

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