From 88a31d5a960bd10f3799bc00f8aa24461567d06e Mon Sep 17 00:00:00 2001
From: shimai <shimai@example.com>
Date: Tue, 07 Apr 2026 15:23:43 +0800
Subject: [PATCH] Merge branch 'test/tony.cheng/260312' of http://120.79.193.119:9090/r/~chengmw/cloud-melody-front into test/shimai.huang/260309
---
web-app/src/utils/urlParams.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/web-app/src/utils/urlParams.js b/web-app/src/utils/urlParams.js
index 8b9404d..cfba4c6 100644
--- a/web-app/src/utils/urlParams.js
+++ b/web-app/src/utils/urlParams.js
@@ -39,11 +39,11 @@
* @returns {Object} 合并后的参数对象
*/
export const getMergedParams = () => {
- // const defaultParams = getDefaultParams();
+ const defaultParams = getDefaultParams();
const urlParams = parseUrlParams();
return {
- // ...defaultParams,
+ ...defaultParams,
...urlParams
};
};
--
Gitblit v1.8.0