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

gaoluyang

2 天以前 7a5c5250b66cc6faffbcac9e192073473c50f79f

 src/views/mes/md/workstation/workshop/index.vue

@@ -2,7 +2,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop';

import { Page, useVbenModal } from '../../../../../packages/effects/common-ui/src';
import { Page, useVbenModal } from '@vben/common-ui';

import { Button, message } from 'ant-design-vue';