Merge remote-tracking branch 'origin/zmy'
# Conflicts: # doctor-api/doctor-api-system/src/main/java/doctor/system/api/RemoteDoctorService.java # doctor-api/doctor-api-system/src/main/java/doctor/system/api/factory/RemoteDoctorFallbackFactory.java # doctor-api/doctor-api-system/src/main/java/doctor/system/api/model/LoginUser.java # doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/ServiceNameConstants.java # doctor-modules/doctor-health/pom.xml # doctor-modules/doctor-health/src/main/java/doctor/domain/entity/DoctorUser.javajpz
commit
326b56485f
|
@ -2,9 +2,6 @@ package doctor.system.api.model;
|
|||
|
||||
import java.io.Serializable;
|
||||
import java.util.Set;
|
||||
|
||||
import doctor.system.api.domain.Department;
|
||||
import doctor.system.api.domain.Doctor;
|
||||
import doctor.system.api.domain.SysUser;
|
||||
import doctor.system.api.domain.User;
|
||||
|
||||
|
|
Loading…
Reference in New Issue