Commit Graph

8 Commits (062364aca8e0b9856c4c98699f57a92d7cbdb7ce)

Author SHA1 Message Date
zmyYYDS 062364aca8 zmy04 2024-01-11 22:13:11 +08:00
zmyYYDS 326b56485f 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.java
2024-01-11 22:08:07 +08:00
fjj a7cbc827c5 合并 2024-01-11 17:29:36 +08:00
fjj f5fe48a32b Merge remote-tracking branch 'origin/fjj'
# Conflicts:
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoBuy.java
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserVideoCollection.java
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/UserWallet.java
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Video.java
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoComment.java
#	doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/VideoCount.java
2024-01-11 16:59:50 +08:00
chenbingxuan f51a92ea03 auth登录接口 2024-01-10 22:06:59 +08:00
chenbingxuan b37198b733 auth登录接口 2024-01-10 14:44:27 +08:00
chenbingxuan 2445549869 auth登录接口 2024-01-09 22:34:01 +08:00
chenbingxuan 59c4f1b7f9 智慧医疗 2024-01-05 20:22:37 +08:00