# Conflicts: # doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java # doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java |
||
---|---|---|
.. | ||
src/main | ||
pom.xml |
# Conflicts: # doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java # doctor-auth/src/main/java/doctor/auth/service/HealthUserService.java |
||
---|---|---|
.. | ||
src/main | ||
pom.xml |