 chenbingxuan
|
9ed8c924ee
|
1.21
|
2024-01-21 19:08:03 +08:00 |
|
chenbingxuan
|
10a4a491ac
|
1.21
|
2024-01-21 19:07:08 +08:00 |
|
chenbingxuan
|
9b66e3f71a
|
1.21
|
2024-01-21 19:06:07 +08:00 |
|
chenbingxuan
|
e0fa5bc2e9
|
1.21
|
2024-01-21 19:05:24 +08:00 |
fjj
|
3702701c0d
|
充值
|
2024-01-21 19:02:04 +08:00 |
liyongbin
|
72fbfd4649
|
病友圈最新
|
2024-01-21 14:30:37 +08:00 |
|
liyongbin
|
d507b1b95f
|
Merge remote-tracking branch 'origin/newMaster' into newMaster
# Conflicts:
# doctor-modules/doctor-health/src/main/java/doctor/controller/DiseaseKnowledgeController.java
# doctor-modules/doctor-health/src/main/java/doctor/service/impl/PatientServiceImpl.java
# doctor-modules/doctor-health/src/main/resources/mapper/doctor/PatientMapper.xml
|
2024-01-21 11:50:41 +08:00 |
|
liyongbin
|
3b4600db02
|
病友圈最新
|
2024-01-21 11:50:00 +08:00 |
|
chenbingxuan
|
b7c3a1f09e
|
1.20
|
2024-01-20 09:42:23 +08:00 |
|
chenbingxuan
|
0492e0b5e3
|
1.20
|
2024-01-20 09:42:06 +08:00 |
|
liyongbin
|
c309b2ce34
|
Merge remote-tracking branch 'origin/newMaster' into newMaster
# Conflicts:
# doctor-modules/doctor-health/src/main/java/doctor/controller/PatientController.java
# doctor-modules/doctor-health/src/main/java/doctor/service/PatientService.java
|
2024-01-20 08:57:31 +08:00 |
|
liyongbin
|
cd84674a50
|
病友圈最新
|
2024-01-20 08:57:10 +08:00 |
 jpz
|
9dbbdf5731
|
1.20
|
2024-01-20 08:46:37 +08:00 |
|
fjj
|
a334ab2fb8
|
充值
|
2024-01-20 08:35:06 +08:00 |
|
fjj
|
a41e75e9c4
|
Merge branch 'newMaster' of https://gitea.qinmian.online/cbx/Medical_Treatment into newMaster
|
2024-01-20 08:33:58 +08:00 |
|
chenbingxuan
|
3a62f92629
|
1.20
|
2024-01-20 08:31:20 +08:00 |
|
fjj
|
d29222fefa
|
Merge branch 'fjj' of https://gitea.qinmian.online/cbx/Medical_Treatment into newMaster
|
2024-01-18 10:29:13 +08:00 |
|
fjj
|
7d6f974bd4
|
删除购买视频修改
|
2024-01-18 10:28:22 +08:00 |
|
chenbingxuan
|
037643567e
|
Merge remote-tracking branch 'origin/fjj' into newMaster
# Conflicts:
# doctor-modules/doctor-health/pom.xml
# doctor-modules/doctor-health/src/main/java/doctor/convert/VideoConvert.java
|
2024-01-18 10:01:20 +08:00 |
|
fjj
|
a6b1365818
|
完善用户信息4
|
2024-01-19 21:59:37 +08:00 |
|
fjj
|
c33fc3ae52
|
完善用户信息3
|
2024-01-19 21:33:30 +08:00 |
|
fjj
|
2fb6724844
|
Revert "完善用户信息2"
This reverts commit 463d1bf61c.
|
2024-01-19 20:47:59 +08:00 |
|
fjj
|
463d1bf61c
|
完善用户信息2
|
2024-01-19 20:28:34 +08:00 |
|
fjj
|
ca1c7154cd
|
完善用户信息
|
2024-01-19 20:24:13 +08:00 |
|
fjj
|
cade33d093
|
完善用户信息5
|
2024-01-17 22:29:59 +08:00 |
|
chenbingxuan
|
0f3112dcf0
|
Merge remote-tracking branch 'origin/newMaster' into newMaster
# 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/resources/mapper/doctor/DoctorMapper.xml
# 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-17 22:29:21 +08:00 |
|
chenbingxuan
|
bd20153ef9
|
合并,报错待解决
|
2024-01-17 22:26:30 +08:00 |
 zmyYYDS
|
32eb478322
|
zmy09
|
2024-01-17 20:04:02 +08:00 |
|
chenbingxuan
|
bf2c98947f
|
Merge branch 'newMaster' of https://gitea.qinmian.online/cbx/Medical_Treatment into cbx
|
2024-01-17 19:47:09 +08:00 |
|
chenbingxuan
|
7c476c6685
|
1.17
|
2024-01-17 19:46:55 +08:00 |
|
zmyYYDS
|
c9a9ab950f
|
Merge branch 'newMaster' of https://gitea.qinmian.online/cbx/Medical_Treatment into zmy
# Conflicts:
# pom.xml
|
2024-01-17 19:37:38 +08:00 |
|
fjj
|
88ee5e376b
|
更新1
|
2024-01-17 16:49:31 +08:00 |
|
chenbingxuan
|
1eceecfdb2
|
1.17
|
2024-01-17 16:01:53 +08:00 |
|
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 |
|
fjj
|
61d82c1018
|
更新
|
2024-01-17 15:59:30 +08:00 |
|
chenbingxuan
|
228cef25a8
|
1.17
|
2024-01-17 15:57:05 +08:00 |
|
chenbingxuan
|
a2035b5899
|
Merge remote-tracking branch 'origin/cbx' into newMaster
|
2024-01-17 15:56:29 +08:00 |
|
chenbingxuan
|
b62f617ad0
|
1.17
|
2024-01-17 15:54:39 +08:00 |
|
chenbingxuan
|
690e465eea
|
Revert "1.17"
This reverts commit f0c7d44551.
|
2024-01-17 11:46:46 +08:00 |
|
chenbingxuan
|
f0c7d44551
|
1.17
|
2024-01-17 11:35:47 +08:00 |
|
zmyYYDS
|
c439f7a573
|
zmy08
|
2024-01-16 22:34:26 +08:00 |
|
chenbingxuan
|
d294516c49
|
1.16
|
2024-01-16 22:30:44 +08:00 |
|
fjj
|
18acab8006
|
更新
|
2024-01-16 22:27:20 +08:00 |
|
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 |
|
zmyYYDS
|
95219e8eec
|
Merge branch 'newMaster' of https://gitea.qinmian.online/cbx/Medical_Treatment into zmy
# Conflicts:
# doctor-modules/doctor-health/src/main/resources/bootstrap.yml
|
2024-01-16 21:40:13 +08:00 |
|
zmyYYDS
|
b16905e43d
|
zmy07
|
2024-01-16 21:39:53 +08:00 |
|
chenbingxuan
|
0a15f6acdd
|
更新网关
|
2024-01-16 14:32:40 +08:00 |
|
chenbingxuan
|
e00d68ef89
|
1.15日
|
2024-01-15 22:32:04 +08:00 |
|
jpz
|
b5c248d6e5
|
jpz8.0
|
2024-01-15 22:22:48 +08:00 |
|
zmyYYDS
|
13779a763d
|
zmy06
|
2024-01-15 22:22:30 +08:00 |