fjj
|
18acab8006
|
更新
|
2024-01-16 22:27:20 +08:00 |
|
fjj
|
16bc23b2a2
|
Merge branch 'cbx' of https://gitea.qinmian.online/cbx/Medical_Treatment into fjj
# Conflicts:
# doctor-api/doctor-api-system/src/main/java/doctor/system/api/domain/User.java
|
2024-01-14 16:14:58 +08:00 |
|
fjj
|
335c3ac82f
|
后台接口4
|
2024-01-14 16:11:48 +08:00 |
 chenbingxuan
|
bf29dcfee2
|
上传图片+回显医生详情
|
2024-01-14 15:13:38 +08:00 |
|
chenbingxuan
|
54c88e0c6e
|
合并代码
|
2024-01-13 10:10:44 +08:00 |
|
chenbingxuan
|
48a29d725f
|
合并代码
|
2024-01-13 10:00:27 +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
|
0d16cc8f0e
|
后台接口3
|
2024-01-13 09:15:21 +08:00 |
|
chenbingxuan
|
bb50f5a2b9
|
申请入驻完结撒花
|
2024-01-12 21:47:55 +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 |
 jpz
|
16030f8df7
|
Merge remote-tracking branch 'origin/jpz'
# Conflicts:
# doctor-auth/src/main/resources/bootstrap.yml
# doctor-common/doctor-common-core/src/main/java/doctor/common/core/domain/HealthR.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/pom.xml
# 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-12 19:43:50 +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
|
4a40a3f0ac
|
zmy03
|
2024-01-11 22:05:24 +08:00 |
|
chenbingxuan
|
9b30e365ca
|
auth登录接口
|
2024-01-11 22:05:09 +08:00 |
|
chenbingxuan
|
f21632aeda
|
auth登录接口
|
2024-01-11 22:04:59 +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 |
|
jpz
|
2debd213fe
|
jpz4.0
|
2024-01-10 22:25:14 +08:00 |
|
chenbingxuan
|
f51a92ea03
|
auth登录接口
|
2024-01-10 22:06:59 +08:00 |
|
fjj
|
24cd83206c
|
提交1
|
2024-01-10 22:03:15 +08:00 |
|
chenbingxuan
|
f2047d31fe
|
auth登录接口
|
2024-01-10 11:35:39 +08:00 |
|
chenbingxuan
|
2445549869
|
auth登录接口
|
2024-01-09 22:34:01 +08:00 |
|
chenbingxuan
|
26301f6fa9
|
auth登录接口
|
2024-01-08 22:41:31 +08:00 |
|
chenbingxuan
|
e3fbd63fae
|
auth登录接口
|
2024-01-08 18:47:58 +08:00 |
|
chenbingxuan
|
59c4f1b7f9
|
智慧医疗
|
2024-01-05 20:22:37 +08:00 |