From b5fbde51af876f1c2ca17aada31bc723c8b5b4d7 Mon Sep 17 00:00:00 2001
From: unknown <xiesi@csxjy.com>
Date: Wed, 2 Mar 2022 16:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=AF=84=E5=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=93=E5=AE=B6=E6=A8=A1=E6=9D=BF=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/expert/competionList/index.jsx | 13 +++++--------
 src/military/expert/expertList/index.jsx    |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/military/expert/competionList/index.jsx b/src/military/expert/competionList/index.jsx
index c9ff51b58..e09efba10 100644
--- a/src/military/expert/competionList/index.jsx
+++ b/src/military/expert/competionList/index.jsx
@@ -95,16 +95,13 @@ function Competition(props){
         }
       },
       {
-        title: "开始时间",
+        title: "比赛时间",
         dataIndex: "start_time",
-        key: "startTime",
-        align: "center",
-      },
-      {
-        title: "截止时间",
-        dataIndex: "end_time",
-        key: "endTime",
+        key: "time",
         align: "center",
+        render:(text, record)=>{
+          return text +' ~ '+ record.end_time;
+        }
       },
       {
         title: "报名人数",
diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx
index 895adcc55..bade655f8 100644
--- a/src/military/expert/expertList/index.jsx
+++ b/src/military/expert/expertList/index.jsx
@@ -393,7 +393,7 @@ function RegisterList({ showNotification }) {
         >
           <button className="but41_fill">导入</button>
         </Upload>
-        <p className="link" onClick={() => { window.open(httpUrl + '/busiAttachments/download/134') }}>专家注册表模板.xlsx</p>
+        <p className="link" onClick={() => { window.open(`${httpUrl}/busiAttachments/download/${window.location.host.indexOf('osredm') === -1 ? '171' : '137'}`) }}>专家注册表模板.xlsx</p>
         <p className='hint'>提示：只能在导入模版上增减数据，才能导入成功！</p>
       </Modal>
     </div>)