解决合并冲突

openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue

@@ -9,8 +9,8 @@
         @cell-click="clickRow"
       >
         <el-table-column label="模板名称" align="center" prop="templateName" />
-        <el-table-column label="使用范围" align="center" prop="useScopeCode" />
-        <el-table-column label="操作" align="center">
+        <!-- <el-table-column label="使用范围" align="center" prop="useScopeCode" /> -->
+        <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
             <el-button link type="primary" @click.stop="handelDelete(scope.row)">删除</el-button>
           </template>
@@ -43,7 +43,11 @@ const props = defineProps({
     required: true,
   },
 });
+<<<<<<< HEAD
 getList(); 
+=======
+getList();
+>>>>>>> upstream/develop
 function getList() {
   queryParams.value.useScopeCode = 1;
   getEmrTemplateList(queryParams.value).then((res) => {