解决合并冲突

openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/components/api.js

@@ -8,6 +8,14 @@ export function listPatient(query) {
   })
 }
 
+export function devicePatientList(query) {
+  return request({
+    url: '/pharmacy-manage/device-dispense/encounter-list',
+    method: 'get',
+    params: query
+  })
+}
+
 export function listInit(query) {
   return request({
     url: '/pharmacy-manage/western-medicine-dispense/init',