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

gaoluyang

8 小时以前 cb9cd49627b65a4c0e137e08063271a8cefe1826

 src/packages/effects/common-ui/src/components/col-page/col-page.vue

@@ -7,7 +7,7 @@
  ResizableHandle,
  ResizablePanel,
  ResizablePanelGroup,
} from '..\..\..\..\..\@core\ui-kit\shadcn-ui\src';
} from '../../../../../@core/ui-kit/shadcn-ui/src';

import Page from '../page/page.vue';