Commit Graph

72 Commits (a6b136581850b0b28a3bab35e9da2b40b289cd5e)

Author SHA1 Message Date
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 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
chenbingxuan d294516c49 1.16 2024-01-16 22:30:44 +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
fjj 19e318b9e3 资讯详情 2024-01-15 22:13:04 +08:00
fjj 4b0bd7b167 demo01 2024-01-14 22:39:02 +08:00
zmyYYDS 0d1707aa56 zmy04 2024-01-14 20:40:25 +08:00
zmyYYDS c21ad2de7c zmy03 2024-01-14 18:52:14 +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
zmyYYDS ac59b625b9 zmy02 2024-01-14 16:29:12 +08:00
zmyYYDS b40c5f72be zmy01 2024-01-14 16:27:58 +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
fjj 2670eeb00b 后台接口4 2024-01-14 16:11:22 +08:00
chenbingxuan bf29dcfee2 上传图片+回显医生详情 2024-01-14 15:13:38 +08:00
chenbingxuan 48a29d725f 合并代码 2024-01-13 10:00:27 +08:00
chenbingxuan 936c3c3391 合并请求路径(患者) 2024-01-13 09:42:03 +08:00
chenbingxuan f7719d93c1 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	doctor-modules/doctor-health/src/main/java/doctor/controller/UserVideoController.java
#	doctor-modules/doctor-health/src/main/java/doctor/controller/VideoController.java
2024-01-13 09:40:30 +08:00
chenbingxuan 7bf693b9d6 合并请求路径(患者) 2024-01-13 09:37:06 +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 ca6ab99830 视频模块 2024-01-13 09:13:39 +08:00
chenbingxuan fb9a01a958 申请入驻完结撒花 2024-01-13 08:41:13 +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
chenbingxuan bb50f5a2b9 申请入驻完结撒花 2024-01-12 21:47:55 +08:00
zmyYYDS bc77718110 zmy05 2024-01-12 21:40:26 +08:00
fjj 33d722d0b2 后台接口2 2024-01-12 21:31:39 +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
fjj a49d47c6ae 后台接口1 2024-01-12 19:47:56 +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
jpz 3bce4628b2 jpz6.0 2024-01-12 16:29:02 +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
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