 zhutt
|
127b7631c4
|
Merge remote-tracking branch 'origin/main' into zhutt
# Conflicts:
# main.py
|
2026-09-22 09:53:34 +08:00 |
|
 lookerZz
|
d24937ecc3
|
添加statistics tag
|
2026-09-22 09:50:57 +08:00 |
|
|
lookerZz
|
e282f3f7db
|
取消注释
|
2026-09-22 09:17:20 +08:00 |
|
|
zhutt
|
32d4d0ed10
|
班级api,schema,dao
|
2026-09-21 23:23:41 +08:00 |
|
|
zhutt
|
8b364805d1
|
班级api,schema,dao
|
2026-09-21 23:16:01 +08:00 |
|
|
zhutt
|
2287228252
|
班级api,schema,dao
|
2026-09-21 22:20:37 +08:00 |
|
|
lookerZz
|
69761054c7
|
Merge pull request 'Wolin_zk' (#32) from wolin_zk into main
Reviewed-on: #32
|
2026-09-21 22:16:45 +08:00 |
|
|
zhutt
|
725e123668
|
班级api,schema,dao
|
2026-09-21 22:09:19 +08:00 |
|
|
lookerZz
|
087409b219
|
Merge pull request 'Nanfangyu0824' (#31) from nanfangyu0824 into main
Reviewed-on: #31
|
2026-09-21 22:05:58 +08:00 |
|
 wolin_nanfangyu_mj
|
4225c19c07
|
test
|
2026-09-21 22:04:35 +08:00 |
|
|
lookerZz
|
d4955bae95
|
Merge pull request 'api,models consultant.py已更新完毕' (#30) from bx into main
Reviewed-on: #30
|
2026-09-21 22:04:13 +08:00 |
|
 Windows
|
b489c0d870
|
api,models consultant.py已更新完毕
|
2026-09-21 22:03:30 +08:00 |
|
|
lookerZz
|
fa57ed1b46
|
Merge pull request 'Zhangyi' (#29) from zhangyi into main
Reviewed-on: #29
|
2026-09-21 22:02:32 +08:00 |
|
 wolin_zhangyi
|
a602dc9de1
|
1.teacher dao
2.teacher api
|
2026-09-21 22:00:46 +08:00 |
|
|
曾凯
|
43b547ece7
|
api,dao,schemas已完成
|
2026-09-21 21:55:04 +08:00 |
|
|
lookerZz
|
48db8a57ed
|
Merge pull request 'Li yujie' (#28) from LI_YUJIE into main
Reviewed-on: #28
|
2026-09-21 21:55:02 +08:00 |
|
|
wolin_liyujie
|
379f61f5b8
|
合并最新main并解决学生接口冲突
|
2026-09-21 21:50:08 +08:00 |
|
|
wolin_liyujie
|
3577495b6c
|
删除了文档
|
2026-09-21 21:39:13 +08:00 |
|
|
lookerZz
|
6f2d084c22
|
Merge pull request '张昕浩' (#26) from 张昕浩 into main
Reviewed-on: #26
|
2026-09-21 21:32:40 +08:00 |
|
|
wolin_nanfangyu_mj
|
3e3e6d44eb
|
test
|
2026-09-21 21:29:06 +08:00 |
|
|
lookerZz
|
0b72cb78ee
|
bug修改
|
2026-09-21 21:23:43 +08:00 |
|
|
lookerZz
|
ce3cae0b82
|
bug修改
|
2026-09-21 21:21:51 +08:00 |
|
|
wolin_liyujie
|
0b92b17283
|
删除了文档
|
2026-09-21 21:09:38 +08:00 |
|
|
lookerZz
|
9dbe40dacb
|
Merge pull request 'bug修改' (#23) from 张昕浩 into main
Reviewed-on: #23
|
2026-09-21 20:52:18 +08:00 |
|
|
lookerZz
|
35a34c785f
|
bug修改
|
2026-09-21 20:51:07 +08:00 |
|
|
wolin_liyujie
|
85c33509d7
|
删除了文档
|
2026-09-21 20:49:11 +08:00 |
|
|
wolin_liyujie
|
77aa63b17b
|
添加学生模块接口说明
|
2026-09-21 20:45:11 +08:00 |
|
|
wolin_liyujie
|
109713f34a
|
解决statistics.py合并冲突
|
2026-09-21 20:44:27 +08:00 |
|
|
wolin_liyujie
|
a11da93412
|
完成了添加学生接口的自动生成studentno功能
|
2026-09-21 20:42:53 +08:00 |
|
|
lookerZz
|
f1ddb553e9
|
Merge pull request '完善统计模块及模型' (#22) from 张昕浩 into main
Reviewed-on: #22
|
2026-09-21 20:00:55 +08:00 |
|
|
lookerZz
|
1c220c2a3e
|
移除与main冲突的model修改
|
2026-09-21 19:59:58 +08:00 |
|
|
lookerZz
|
946d428c8b
|
完善统计模块及模型
|
2026-09-21 19:55:51 +08:00 |
|
|
wolin_liyujie
|
90d5d5a944
|
Merge remote-tracking branch 'origin/main' into LI_YUJIE
|
2026-09-21 19:45:40 +08:00 |
|
|
wolin_liyujie
|
30e6af308d
|
完成了添加学生接口的自动生成studentno功能
|
2026-09-21 19:28:15 +08:00 |
|
|
wolin_zhangyi
|
946d4f0b84
|
Merge branch 'main' into zhangyi
# Conflicts:
# models/class_teacher.py
# models/teacher.py
|
2026-09-21 19:23:33 +08:00 |
|
|
wolin_zhangyi
|
883b287e66
|
1.teacher dao
2.class_teacher
3.teacher api
4.teacher models
5.teacher schemas
|
2026-09-21 18:46:42 +08:00 |
|
|
wolin_liyujie
|
8b0cdbdb10
|
完成了增加学生接口
|
2026-09-21 17:53:12 +08:00 |
|
|
wolin_liyujie
|
4d811348ac
|
完成了增加学生接口
|
2026-09-21 17:51:33 +08:00 |
|
|
zhutt
|
01fee950bf
|
班级api,schema,dao
|
2026-09-21 17:29:32 +08:00 |
|
|
lookerZz
|
ae5a5a773e
|
Merge pull request 'main,schemas,dao,api,model consultant.py已更新完毕' (#19) from bx into main
Reviewed-on: #19
|
2026-09-21 17:04:01 +08:00 |
|
|
Windows
|
069a4fcea3
|
model consultant.py已更新完毕
|
2026-09-21 17:01:33 +08:00 |
|
|
曾凯
|
df9b543d31
|
Merge branch 'main' of http://47.106.207.27:3000/lookerZz/DoubaoTeam into wolin_zk
|
2026-09-21 16:57:04 +08:00 |
|
|
lookerZz
|
1288b932b5
|
Merge pull request 'Li yujie' (#18) from LI_YUJIE into main
Reviewed-on: #18
|
2026-09-21 16:36:15 +08:00 |
|
|
wolin_liyujie
|
19b5ad46f7
|
解决main分支合并冲突
|
2026-09-21 16:35:23 +08:00 |
|
|
wolin_liyujie
|
92e8bf0b92
|
写好了增加学生接口，增加学生dao层，main里加入了student——router
|
2026-09-21 16:26:57 +08:00 |
|
|
wolin_liyujie
|
1a8e4f7571
|
写好了增加学生接口，增加学生dao层，main里加入了student——router
|
2026-09-21 16:19:44 +08:00 |
|
|
曾凯
|
37b79d371a
|
曾凯修改了student_id中外键约束更改了student_info_detail.id
|
2026-09-21 16:07:31 +08:00 |
|
|
曾凯
|
eaa940e751
|
曾凯修改了student_id中外键约束更改了大写Student.id，原先为小写student.id
|
2026-09-21 15:48:13 +08:00 |
|
|
lookerZz
|
89a10c598b
|
update teacher models
|
2026-09-21 15:06:09 +08:00 |
|
|
lookerZz
|
da71b48a10
|
Merge pull request '两个模块' (#14) from 张昕浩 into main
Reviewed-on: #14
|
2026-09-21 14:40:35 +08:00 |
|