From 87631b1fdb7ab44e2330e08c24d03a3097e67045 Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Tue, 30 Nov 2021 16:22:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=90=E5=B7=9E?=
 =?UTF-8?q?=E4=B8=89=E7=BB=B4=E6=BC=94=E7=A4=BAIcon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/scripts/ProjectConfig.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index f5011cc02..c1c94ec02 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -62,6 +62,7 @@ export const loginInfo = {
       loginParam: 'DEFAULT',
       loginTitle: '空串',
       logoWidth: '140px',
+      bottomColumn:'',
       navigationLogoWidth: '120px',
       navigationMarginLeft: '140px',
       systemType: '011'
@@ -586,6 +587,7 @@ export const ProjectIcon = {
     xty: FaviconXty,
     zzww: FaviconZzww,
     zzwwtest: FaviconZzww,
+    xzexam:TransparentIcon,
     login: Favicon,
     design: Favicon,
     designxty: FaviconXty,

From a541853b8f5eada31f4de75154f2fe183252570d Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Tue, 30 Nov 2021 16:23:24 +0800
Subject: [PATCH 2/2] merge

---
 src/scripts/ProjectConfig.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index 4691b1f4b..bfe8801e4 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -57,17 +57,6 @@ export const loginInfo = {
         systemType: '011'
     },
     xzexam:{
-<<<<<<< HEAD
-      title: '城市轨道交通标准化培训软件',
-      loginPath: '/login?project=xzexam',
-      loginParam: 'DEFAULT',
-      loginTitle: '空串',
-      logoWidth: '140px',
-      bottomColumn:'',
-      navigationLogoWidth: '120px',
-      navigationMarginLeft: '140px',
-      systemType: '011'
-=======
         title: '城市轨道交通标准化培训软件',
         loginPath: '/login?project=xzexam',
         loginParam: 'DEFAULT',
@@ -76,7 +65,6 @@ export const loginInfo = {
         navigationLogoWidth: '120px',
         navigationMarginLeft: '140px',
         systemType: '011'
->>>>>>> c33502b31addf90a7737e6845b983e598c590404
     },
     bjd: {
         title: '城市轨道交通列车运行智慧辅助系统',