Merge branch 'moss_dev' into develop

* moss_dev:
  no message

src/views/mallManagement/storage/index.vue

@@ -124,7 +124,7 @@ export default {
         },
       }, {
         md: 6,
-        isShow: true,
+        isShow: this.formData.type.length > 0 && this.formData.type.indexOf('商品') < 0,
         name: 'el-select',
         options: this.websitList,
         attributes: { filterable: true, placeholder: '请选择', disabled: this.formDialogType == 1 },