Merge remote-tracking branch 'origin/develop' into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 1a1cff00ad9cbf6676879d58e4d8b15163be1114
+  newTag: ad200dc1515c0c4aabd0709d354c997064ba1b19

src/router/router.tsx

@@ -501,10 +501,9 @@ export const routerList: Array<RouteObjectType> = [
     element: <LayoutView />,
     errorElement: <ErrorPage />,
     meta: {
-      id: 1100,
+      id: 500,
       icon: <FireOutlined />,
       title: '营销管理',
-      develop: true,
     },
     children: [
       {
@@ -512,10 +511,9 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<RewardsManageView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 1110,
+          id: 510,
           title: '签到奖励',
           icon: <InsertRowAboveOutlined />,
-          develop: true,
         },
       },
     ],