Merge remote-tracking branch 'upstream/software_factory' into dev_management_pipelineCardList

src/font/font.css

@@ -1,5 +1,5 @@
 /* 导航栏 */
 @font-face {
   font-family: "YouSheBiaoTiHei";
-  src: url('./youshebiaotihei-2-webfont.woff2');
+  src: url('./YouSheBiaoTiHei-2.ttf');
 }

src/forge/Head/Header.js

@@ -336,9 +336,8 @@ class NewHeader extends Component {
       <div className={publicNav ? `newHeaders publicNav`:`newHeaders`} id="nHeader">
         <div className="headerContent">
           <div className="titleByHead">
-            <img src={logo} alt="" style={{width: '32px'}} />
+            <img src={logo} alt="" style={{width: '35px'}} />
             <span className='font32 ml15'>{mygetHelmetapi && mygetHelmetapi.name}</span>
-            <span className='font24 ml15'>群智开发</span>
           </div>
           {isRender === true ?
             <LoginDialog

src/modules/loginRegister/Login.jsx

@@ -80,7 +80,7 @@ function Login(props){
     <div>
       <div className="right_cont login_content">
         <div className="login_register_head mb30">
-          <span>欢迎登录 软件发展新技术</span>
+          <span>欢迎登录 {mygetHelmetapi && mygetHelmetapi.name}</span>
           <span className="link_span">没有账号？<Link to={`/register`}>去注册</Link></span>
         </div>
         <p className = {message?"message active mb10":"message"}>{message}</p>

src/modules/loginRegister/LoginNew.jsx

@@ -91,7 +91,7 @@ function Login(props){
   return(
     <div className="right_cont login_content">
       <div className="login_register_head mb60">
-        <p>欢迎登录 <span className="head_blue">群智开发</span></p>
+        <p>欢迎登录 <span className="head_blue">{mygetHelmetapi && mygetHelmetapi.name}</span></p>
       </div>
       <p className = {message?"message active mb10":"message"}>{message}</p>
       <Form className="login-form">

src/modules/loginRegister/RegisterNew.jsx

@@ -227,7 +227,7 @@ function Register(props){
   return(
     <div className="right_cont Register_content">
       <div className="login_register_head mb30">
-        <p>欢迎注册 <span className="head_blue">群智开发</span></p>
+        <p>欢迎注册 <span className="head_blue">{mygetHelmetapi && mygetHelmetapi.name}</span></p>
       </div>
       <div className="registerNav mb28 font-16">
         <a className={`type ${registerType ? '' : 'activeRegisterNav'}`} onClick={()=>{changeRegisterType(0)}}>手机号注册</a>