Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
#	mes/qd/src/api/wms/basedata/master/customerbase.js

mes/qd/src/api/wms/basedata/master/customerbase.js

@@ -32,4 +32,11 @@ export function excelImport(data) {
   })
 }
 
-export default { add, edit, del, excelImport }
+export function selectList() {
+  return request({
+    url: 'api/customerbase/selectList',
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, selectList, excelImport }

mes/qd/src/api/wms/pcs/saleOrder.js

@@ -1,27 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/saleOrder',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/saleOrder/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/saleOrder',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del }