Merge branch 'master' into develop

src/pages/mallManage/rentGoods/rentAddOrEditOrDetail/index.tsx

@@ -89,7 +89,7 @@ const GoodsAddOrEditOrDetail = () => {
   };
   //根据目录获取分类列表
   const getCategoryList = (directoryId: number) => {
-    CategoryManageAPI.getCategoryList({ directoryId, type: 4, pageSize: 9999, pageNo: 1 }).then(
+    CategoryManageAPI.getCategoryList({ directoryId, type: 2, pageSize: 9999, pageNo: 1 }).then(
       ({ result }) => {
         setCategoryList(result.list || []);
       },