Merge branch 'master' into develop

src/components/goods/commonAddOrEdit/baseInfo/index.tsx

@@ -87,6 +87,9 @@ const BaseInfo: React.FC<selfProps> = forwardRef(
       });
     };
     const directorySelectChange = (value: number) => {
+      form.setFieldsValue({
+        masterTypeId: undefined,
+      });
       getCategoryList(value);
     };
     //商品标签