fjj
|
20231281bc
|
Merge remote-tracking branch 'origin/fjj' into newMaster
# Conflicts:
# doctor-modules/doctor-health/src/main/java/doctor/controller/HealthJobTitleController.java
# doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
# doctor-modules/doctor-health/src/main/java/doctor/mapper/UserVideoMapper.java
# doctor-modules/doctor-health/src/main/java/doctor/service/UserVideoService.java
# doctor-modules/doctor-health/src/main/java/doctor/service/impl/UserVideoServiceImpl.java
# doctor-modules/doctor-health/src/main/resources/mapper/doctor/UserVideoMapper.xml
|
2024-01-17 16:00:30 +08:00 |
 chenbingxuan
|
a2035b5899
|
Merge remote-tracking branch 'origin/cbx' into newMaster
|
2024-01-17 15:56:29 +08:00 |
|
fjj
|
18acab8006
|
更新
|
2024-01-16 22:27:20 +08:00 |
|
chenbingxuan
|
0a15f6acdd
|
更新网关
|
2024-01-16 14:32:40 +08:00 |
|
chenbingxuan
|
e00d68ef89
|
1.15日
|
2024-01-15 22:32:04 +08:00 |
 zmyYYDS
|
b6f482f009
|
Merge branch 'newMaster' of https://gitea.qinmian.online/cbx/Medical_Treatment into zmy
# Conflicts:
# 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/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-14 16:29:49 +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
|
fb9a01a958
|
申请入驻完结撒花
|
2024-01-13 08:41:13 +08:00 |
 jpz
|
1ebf5f3085
|
jpz6.0
|
2024-01-12 22:13:11 +08:00 |
|
chenbingxuan
|
c545e129ab
|
Merge branch 'master' of https://gitea.qinmian.online/cbx/Medical_Treatment into cbx
# Conflicts:
# doctor-auth/src/main/resources/bootstrap.yml
# 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/domain/entity/UserEntity.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-12 21:49:12 +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
|
2c07292727
|
登录完结撒花
|
2024-01-12 10:58:34 +08:00 |
|
jpz
|
046dbafaa2
|
jpz5.0
|
2024-01-11 22:24:55 +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
|
f51a92ea03
|
auth登录接口
|
2024-01-10 22:06:59 +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
|
59c4f1b7f9
|
智慧医疗
|
2024-01-05 20:22:37 +08:00 |