Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd

# Conflicts:
#	pnpm-lock.yaml
#	src/components/_base/navbar/index.vue
#	src/components/text-over-tips/index.vue
#	src/layouts/Basic.vue
#	src/layouts/Page.vue
#	src/main.ts
#	src/router/constants.ts
#	src/router/index.ts
#	src/router/typeings.d.ts
#	src/utils/tools.ts

src/router/constants.ts

@@ -23,9 +23,10 @@ export const DEFAULT_ROUTE = {
 
 export const MENU_GROUP_IDS = {
   DATA_ENGINE_ID: 1, // 全域数据分析
-  CREATIVE_GENERATION_WORKSHOP_ID: 2, // 创意生成工坊
+  AGENT: 2,
   MANAGEMENT_ID: 3, // 管理中心
   PROPERTY_ID: 4, // 资产营销平台
   WORK_BENCH_ID: 5, // 工作台
   WRITER_CREATIVE_GENERATION_WORKSHOP_ID: 6, // 内容稿件-写手侧
+  CREATIVE_GENERATION_WORKSHOP_ID: 7  // 创意生成工坊
 };