Commit Graph

125 Commits (newMaster)

Author SHA1 Message Date
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
cbx a563d325e9 Merge pull request 'auth登录接口' (#2) from cbx into master
Reviewed-on: #2
2024-01-10 22:28:10 +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
zmyYYDS e1e029d11e zmy02 2024-01-10 22:05:24 +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 4d51a66ed0 auth登录接口 2024-01-10 14:44:27 +08:00
chenbingxuan b37198b733 auth登录接口 2024-01-10 14:44:27 +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
zmyYYDS 08c2dacb77 zmy01 2024-01-09 22:31:00 +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 d1f85c8818 jpz2.0 2024-01-08 22:40:56 +08:00
jpz 0d72b7080c jpz1.0 2024-01-08 22:06:22 +08:00
chenbingxuan e3fbd63fae auth登录接口 2024-01-08 18:47:58 +08:00
chenbingxuan efeb753b21 根目录 2024-01-08 15:09:31 +08:00
chenbingxuan 13c954d72e health模块 2024-01-08 14:46:41 +08:00
chenbingxuan 59c4f1b7f9 智慧医疗 2024-01-05 20:22:37 +08:00