Merge branch 'dev' into 'test'

商品列表获取供应商选项

See merge request quanshu/mp-ui-pc!272

src/views/business/goods/add.vue

@@ -299,7 +299,7 @@ export default {
     },
     //获取供应商
     getSupplierItems(){
-      getSupplierList({name:""}).then(res => {
+      getSupplierList('',{name:""}).then(res => {
         this.SupplierList = res && res.rows
       })
     },

src/views/business/goods/index.vue

@@ -171,7 +171,7 @@ export default {
   methods: {
     //获取供应商
     getSupplierItems(){
-      getSupplierList({name:""}).then(res => {
+      getSupplierList('',{}).then(res => {
         this.SupplierList = res && res.rows
       })
     },