解决合并冲突并优化代码结构

2025-12-10 14:24:34 +08:00
parent 18f6a845e6
commit b863c14f2b
4 changed files with 20 additions and 270 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue
@@ -43,11 +43,7 @@ const props = defineProps({
    required: true,
  },
 });
-<<<<<<< HEAD
 getList(); 
-=======
-getList();
->>>>>>> upstream/develop
 function getList() {
  queryParams.value.useScopeCode = 1;
  getEmrTemplateList(queryParams.value).then((res) => {