Commit Graph

33 Commits (fb9a01a9583efc83d1693d491daa775c679efaeb)

Author SHA1 Message Date
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
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
zmyYYDS e823462f26 zmy02 2024-01-11 22:05:10 +08:00
chenbingxuan 9b30e365ca auth登录接口 2024-01-11 22:05:09 +08:00
chenbingxuan f21632aeda auth登录接口 2024-01-11 22:04:59 +08:00
zmyYYDS c1b11491a7 zmy01 2024-01-11 22:02:31 +08:00
fjj a7cbc827c5 合并 2024-01-11 17:29:36 +08:00
fjj 3e2f582a3e Merge branch 'master' of https://gitea.qinmian.online/cbx/Medical_Treatment 2024-01-11 17:06:47 +08:00
fjj fad38829f9 domain 2024-01-11 17:06:12 +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
fjj 1fb6eda59f 视频模块2 2024-01-11 16:57:37 +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 d8e4d39d92 视频模块1 2024-01-10 22:04:06 +08:00
fjj 24cd83206c 提交1 2024-01-10 22:03:15 +08:00
chenbingxuan f2047d31fe auth登录接口 2024-01-10 11:35:39 +08:00
jpz 744f6950ff jpz3.0 2024-01-09 22:35:15 +08:00
chenbingxuan 2445549869 auth登录接口 2024-01-09 22:34:01 +08:00
jpz cd27ebde9a Merge branch 'cbx' of https://gitea.qinmian.online/cbx/Medical_Treatment into jpz 2024-01-09 14:35:24 +08:00
chenbingxuan 26301f6fa9 auth登录接口 2024-01-08 22:41:31 +08:00
jpz 0d72b7080c jpz1.0 2024-01-08 22:06:22 +08:00
chenbingxuan 13c954d72e health模块 2024-01-08 14:46:41 +08:00
chenbingxuan 59c4f1b7f9 智慧医疗 2024-01-05 20:22:37 +08:00