Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
-  newTag: 3018428edaf6324b1a6b636ac94c4202918e3b9c
+  newTag: e622090a5db3a73133cf616865a134ee51cb7c85

src/pages/customManage/customList/index.tsx

@@ -179,7 +179,7 @@ function CustomListView() {
       align: 'center',
       render: (_text, record) =>
         record?.userRcdVO?.id &&
-        `${record?.userRcdVO?.rcdUserName || record?.userRcdVO?.rcdNickname}(${
+        `${record?.userRcdVO?.rcdUserName || record?.userRcdVO?.rcdNickname || '游客'}(${
           record?.userRcdVO?.rcdUserId
         })`,
     },

src/pages/rentManage/rentGoods/rentAddOrEdit/index.tsx

@@ -65,7 +65,7 @@ const RentAddOrEdit = () => {
         });
       })
       .catch((error: any) => {
-        message.warning(error.errorFields[0].errors[0] || error);
+        message.warning(error?.errorFields?.[0].errors?.[0] || error);
         if (error?.errorFields) {
           goodsInfoRef.current
             .getForm()

src/router/router.tsx

@@ -83,7 +83,6 @@ const TagManageView = React.lazy(() => import('~/pages/resourceManage/tagManage'
 const IndustryNewsView = React.lazy(() => import('~/pages/resourceManage/industryNews'));
 //论坛管理
 const DynamicListView = React.lazy(() => import('~/pages/forumManage/dynamicList'));
-// 话题列表
 const TopicListView = React.lazy(() => import('~/pages/forumManage/topicList'));
 // 订单
 const ProductOrderView = React.lazy(() => import('src/pages/orderManage/productOrder/orderList')); //销售订单
@@ -535,7 +534,6 @@ export const routerList: Array<RouteObjectType> = [
           id: 620,
           title: '话题列表',
           icon: <ThunderboltOutlined />,
-          develop: true,
         },
       },
     ],