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

# Conflicts:
#	web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalAssetsController.java

portal-ui/src/lang/zh_HK/route.js

@@ -12,6 +12,5 @@ export default {
 	moneyInvite: '有獎邀請',
 	assetGroupManage: '資源組管理',
 	assetManage: '素材管理',
-	thirdPartyAsset: '三方素材管理',
+	generatedAssets: '作品库'
-	generatedAssets: '生成庫'
 }

portal-ui/src/layout/components/Menu.vue

@@ -47,7 +47,7 @@ import { constantRoutes } from '@/router/index'
 import { generateTitle, generateLang } from '@/utils/i18n'
 
 /** 左侧导航仅显示这些路由（name 与 router/index.js 一致） */
-const SIDEBAR_ONLY_ROUTE_NAMES = ['video-gen', 'third-party-asset', 'generated-assets']
+const SIDEBAR_ONLY_ROUTE_NAMES = ['video-gen', 'asset-group-manage', 'asset-manage', 'generatedAssets']
 
 defineProps({
 	collapsed: Boolean

portal-ui/src/router/index.js

@@ -169,6 +169,16 @@ export const constantRoutes = [{
 				permission: "pass",
 				icon: 'btn_video'
 			}
+		}, {
+			path: 'generated-assets',
+			name: 'generatedAssets',
+			component: () => import('@/views/GeneratedAssets.vue'),
+			meta: {
+				title: 'generatedAssets',
+				menuItem: true,
+				permission: "pass",
+				icon: 'btn_video'
+			}
 		}, {
 			path: 'recharge',
 			name: 'recharge',