Merge branch 'moss_dev' into develop

* moss_dev:
  no message

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -916,7 +916,7 @@ export default {
     },
 
     getStorageList() {
-      Storage.getList({ pageNum: 1, pageSize: -1 }).then(res => {
+      Storage.getList({ pageNum: 1, pageSize: -1, type: '商品' }).then(res => {
         this.storageList = res.data.records;
       })
     },