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

gaoluyang

7 小时以前 cb9cd49627b65a4c0e137e08063271a8cefe1826

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