# Conflicts: # doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java # doctor-modules/doctor-health/src/main/java/doctor/controller/HealthDepartmentController.java # doctor-modules/doctor-health/src/main/java/doctor/controller/InformationController.java # doctor-modules/doctor-health/src/main/java/doctor/domain/entity/InquiryDetailsRecordEntity.java # doctor-modules/doctor-health/src/main/java/doctor/domain/vo/DoctorVo.java |
||
---|---|---|
.. | ||
doctor-api-system | ||
pom.xml |