# Conflicts: # openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue # openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue
The file is empty.
# Conflicts: # openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue # openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue