From d7bdb35bb785147bdf9f6f0ebeb0fee2c4a51520 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Fri, 22 Oct 2021 11:28:22 +0800
Subject: [PATCH 1/2] merge bug

---
 src/forge/Main/Detail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index cad0874e..481ae3ee 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -575,7 +575,7 @@ class Detail extends Component {
                     </span>
                 }
               </div>
-            </AlignCenter>
+            </AlignTop>
             <div className="mt6" style={{minHeight:"20px"}}>
               {
                 projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?

From 848109afe821fafa6acab5aac1c7413e9613ab0a Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Fri, 22 Oct 2021 11:40:41 +0800
Subject: [PATCH 2/2] settings

---
 src/modules/login/EducoderLogin.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js
index ab6a9fe1..21c6f23a 100644
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@@ -89,14 +89,15 @@ class EducoderLogin extends Component {
 
 
     render() {
-        let {showbool,loginstatus,logini} = this.state;
+        let { showbool } = this.state;
+        const { mygetHelmetapi } = this.props;
         return (
             <div style={newContainer} className=" clearfix" >
                 <div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}>
                     <div style={{cursor:"pointer"}}>
                         {
-                            settings && settings.login_logo_url ?
-                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(settings.login_logo_url)}/>
+                            mygetHelmetapi && mygetHelmetapi.login_logo_url ?
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(mygetHelmetapi.login_logo_url)}/>
                             :
                             <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/>
                         }