fix:解决冲突

src/business/platform/data/templaterender/templates/list.vue

@@ -124,21 +124,14 @@
       :dynamic-params="templateDialogDynamicParams" @close="visible => templateDialogVisible = visible"
       @action-event="handleTemplateDialogActionEvent" />
     <!-- 表单打印-->
-    <<<<<<< Updated upstream <form-print-template :id="printTemplateId" :pk="pkValue"
-      :visible="formPrintTemplateDialogVisible" @close="visible => formPrintTemplateDialogVisible = visible" />
-    <component :is="dialogTemplate" v-if="dialogTemplate" ref="dialogTemplate" v-bind="dialogTemplateAtts" />
-    <bpmn-formrender :visible="npmDialogFormVisible" :def-id="defId" :instance-id="instanceId" :task-id="taskId"
-      :addDataCont="addDataCont" @callback="search" @close="loadFlowFData" />
-    <Scan :currentScan="scanName" :scanVisible="scanVisible" :obj="obj" v-if="scanVisible" @scanOff="scanOff" />
-    <print :show="showPrint" :list="printList" :type="printType" />
-    =======
     <form-print-template :id="printTemplateId" :pk="pkValue" :visible="formPrintTemplateDialogVisible"
       @close="visible => formPrintTemplateDialogVisible = visible" />
     <component :is="dialogTemplate" v-if="dialogTemplate" ref="dialogTemplate" v-bind="dialogTemplateAtts" />
     <bpmn-formrender :visible="npmDialogFormVisible" :def-id="defId" :instance-id="instanceId" :task-id="taskId"
       :addDataCont="addDataCont" @callback="search" @close="loadFlowFData" />
     <Scan :currentScan="scanName" :scanVisible="scanVisible" :obj="obj" v-if="scanVisible" @scanOff="scanOff" />
-    >>>>>>> Stashed changes
+    <print :show="showPrint" :list="printList" :type="printType" />
+
   </div>
 </template>
 <script>