 zmyYYDS
|
d63616c133
|
Merge branch 'jpz' of https://gitea.qinmian.online/cbx/Medical_Treatment into zmy
# 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
|
2024-01-16 21:41:56 +08:00 |
 jpz
|
4bf159ea48
|
jpz7.0
|
2024-01-14 22:36:10 +08:00 |
 chenbingxuan
|
bf29dcfee2
|
上传图片+回显医生详情
|
2024-01-14 15:13:38 +08:00 |
fjj
|
78e0b47c61
|
Merge remote-tracking branch 'origin/fjj'
# Conflicts:
# doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/Doctor.java
# doctor-auth/src/main/resources/bootstrap.yml
# doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/Constants.java
# doctor-gateway/src/main/resources/bootstrap.yml
# doctor-modules/doctor-file/src/main/resources/bootstrap.yml
# doctor-modules/doctor-gen/src/main/resources/bootstrap.yml
# doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
# doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java
# doctor-modules/doctor-health/src/main/java/doctor/domain/entity/Video.java
# doctor-modules/doctor-health/src/main/java/doctor/mapper/VideoMapper.java
# doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
# doctor-modules/doctor-health/src/main/java/doctor/service/VideoService.java
# doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
# doctor-modules/doctor-health/src/main/java/doctor/service/impl/VideoServiceImpl.java
# doctor-modules/doctor-health/src/main/resources/bootstrap.yml
# doctor-modules/doctor-job/src/main/resources/bootstrap.yml
# doctor-modules/doctor-system/src/main/resources/bootstrap.yml
# doctor-visual/doctor-monitor/src/main/resources/bootstrap.yml
|
2024-01-13 09:16:42 +08:00 |
|
fjj
|
d9954c2ab1
|
Merge branch 'master' of https://gitea.qinmian.online/cbx/Medical_Treatment into fjj
# Conflicts:
# doctor-modules/doctor-health/src/main/java/doctor/domain/entity/UserEntity.java
# doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCommentEntity.java
# doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoCountEntity.java
# doctor-modules/doctor-health/src/main/java/doctor/domain/entity/VideoEntity.java
|
2024-01-12 20:26:27 +08:00 |
|
chenbingxuan
|
2c07292727
|
登录完结撒花
|
2024-01-12 10:58:34 +08:00 |
|
chenbingxuan
|
04dc67459d
|
Merge branch 'master' of https://gitea.qinmian.online/cbx/Medical_Treatment into cbx
# 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
|
2024-01-12 10:50:22 +08:00 |
|
fjj
|
227ba63d99
|
合并1
|
2024-01-11 22:26:52 +08:00 |
|
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
|
9d9d3aa146
|
登录完结撒花
|
2024-01-11 16:53:15 +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 |