删除无效合并

2025-12-10 15:28:29 +08:00
parent b0eb9861b9
commit b1117b4157
10 changed files with 0 additions and 730 deletions
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionMedicineList.vue
@@ -15,7 +15,6 @@
      <el-table-column label="规格" align="center" prop="volume" /> -->
      <!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
      <el-table-column label="单次剂量" align="center" prop="dose" />
-<<<<<<< HEAD
      <el-table-column
        label="剂量单位"
        align="center"