Merge branch 'master' into feature/20230109_business_abutment

src/pages/GoodsManage/SearchForm/index.jsx

@@ -84,7 +84,12 @@ class goodsManage extends Component {
       loading: true,
     });
     const form = this.formRef?.current?.getFieldValue();
-    const res = await apiGoodsInfosExport(form);
+    const params = Object.assign({}, form);
+    const productCategoryId = form?.productCategoryId || [];
+    if (productCategoryId.length) {
+      params.productCategoryId = productCategoryId[productCategoryId.length - 1] || '';
+    }
+    const res = await apiGoodsInfosExport(params);
     this.setState({
       loading: false,
     });