From ee08b6f39096d54fd13d5a21292259e02003db2e Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Mon, 5 Sep 2022 15:38:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=85=8D=E7=BD=AE=E5=88=86=E8=BE=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1009478 --user=刘瑶 【UI测试】配置文件可配置分辨率 https://www.tapd.cn/55049933/s/1238845
---
 backend/src/main/java/io/metersphere/xpack | 2 +-
 backend/src/main/resources/base.properties | 3 +++
 frontend/src/business/components/xpack     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 53c8fbe1c2..f30234a434 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 53c8fbe1c2a3beff233546305206621047b03dbd
+Subproject commit f30234a4342e77b32a7af1a2c8a94d27423fa54a
diff --git a/backend/src/main/resources/base.properties b/backend/src/main/resources/base.properties
index 9959b57669..acabc09c53 100644
--- a/backend/src/main/resources/base.properties
+++ b/backend/src/main/resources/base.properties
@@ -105,3 +105,6 @@ spring.session.timeout=${session.timeout:43200}
 spring.session.store-type=none
 # cookie
 server.servlet.session.cookie.max-age=${session.timeout:43200}
+# ui config
+ui.resolution-ratio-x=1920
+ui.resolution-ratio-y=1080
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 5910db5573..1fa61cb98c 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 5910db55736251f71f6bb024b3c7ae1e3ef4ea24
+Subproject commit 1fa61cb98c337a84b779e7a0f660f78e794db3ad