Merge branch 'competition' of http://106.75.45.236:3000/durian/forgeplus-react into dev_military_competition

src/military/expert/expertList/index.jsx

@@ -313,7 +313,7 @@ function RegisterList({ showNotification }) {
       Authorization: cookie.load('autologin_forge_military') || sessionStorage.osredmToken,
     },
   };
-
+  
   return (
     <div className="expert-list centerbox">
       <div className="center-screen" >
@@ -393,7 +393,7 @@ function RegisterList({ showNotification }) {
         >
           <button className="but41_fill">导入</button>
         </Upload>
-        <p className="link" onClick={() => { window.open(httpUrl + '/busiAttachments/download/883') }}>专家注册表模板.xlsx</p>
+        <p className="link" onClick={() => { window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '883' : '136'}`) }}>专家注册表模板.xlsx</p>
         <p className='hint'>提示：只能在导入模版上增减数据，才能导入成功！</p>
       </Modal>
     </div>)

src/military/expert/reviewResult/index.jsx

@@ -42,7 +42,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) {
       }
     },
     {
-      title: '平均得分',
+      title: '最终得分',
       dataIndex: 'finalGrades',
       key: 'phone',
     },