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

hsy

5 天以前 5a90852489e1bf91d386746d75cfa0066c271228

 src/views/wms/md/merchant/components/select.vue

@@ -8,7 +8,7 @@
import {
  CustomerMerchantTypeList,
  SupplierMerchantTypeList,
} from '../../../../../packages/constants/src';
} from '@vben/constants';

import { Select } from 'ant-design-vue';