提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
@@ -166,16 +166,6 @@ const props = defineProps({
    type: Object,
    default: undefined,
  },
-<<<<<<< HEAD
-  medfee_paymtd_code: {
-     type: Array,
-     default: () => [],
-   },
-  feeType: {
-    type: String,
-    default: '',
-  }
-=======
  orgId: {
    type: String,
    default: '',
@@ -184,7 +174,6 @@ const props = defineProps({
    type: String,
    default: '',
  },
->>>>>>> v1.3
 });

 const { proxy } = getCurrentInstance();