在线office

src/pages/main/leader/components/formTable.vue

@@ -331,25 +331,14 @@
             >
             <a
               target="_blank"
-<<<<<<< HEAD
-              href="./static/file/b.xlsx"
-=======
               href="./static/file/c.xlsx"
->>>>>>> cfc652501d2e3f961406c86f210ed803b1275d52
               download="业务需求模板.xlsx"
               >《业务需求模板.xlsx》、</a
             >
             <a
               target="_blank"
-<<<<<<< HEAD
-              href="./static/file/c.xlsx"
-=======
               href="./static/file/b.xlsx"
->>>>>>> cfc652501d2e3f961406c86f210ed803b1275d52
-              download="敏感信息范围说明.xlsx"
-              >《敏感信息范围说明.xlsx》、</a
             >
-            <a
               target="_blank"
               href="./static/file/d.pptx"
               download="关于系统开发需求的汇报（第十期）.pptx"

src/pages/main/leader/demand/demandHomes.vue

@@ -94,11 +94,7 @@
       >
         <Workflow
           :list="fromList"
-<<<<<<< HEAD
-          v-if="isWorkflowStatus == true"
-=======
    
->>>>>>> cfc652501d2e3f961406c86f210ed803b1275d52
           @beforeClose="beforeClose"
           :requestForm="requestForm"
         />