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

liu

3 天以前 950e1332f89e3d18a8f4b415bd4fe274dce1e954

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