提交merge1.3

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue

@@ -49,7 +49,11 @@
 
 <script setup>
 import { getMedicineSummary, getMedicineSummaryDetail } from './api';
+<<<<<<< HEAD
 import { patientInfoList } from '../store/patient.js';
+=======
+import { patientInfoList } from '../../components/store/patient.js';
+>>>>>>> v1.3
 import { ref, getCurrentInstance } from 'vue';
 
 const medicineSummaryFormList = ref([]);