43 Commits
Author SHA1 Message Date
zengjingyu 5bddd97884 Merge pull request 'chongtu1' (#10) from dev_zeng into master
Reviewed-on: #10
2026-09-21 21:49:18 +08:00
zengjingyu fb9a2518ec chongtujiejue 2026-09-21 21:46:37 +08:00
wangbo_stu 82da024fc7 Merge pull request 'wangbo修改的冲突代码' (#9) from dev-wangbo into master
Reviewed-on: #9
2026-09-21 21:43:51 +08:00
zengjingyu cb3a701e25 chongtu1 2026-09-21 21:42:44 +08:00
wangbo_stu 75ea1ae75e wangbo修改的冲突代码 2026-09-21 21:40:18 +08:00
sya 7cafe5e13c Merge pull request '测试冲突' (#7) from shark into master
Reviewed-on: #7
2026-09-21 21:31:25 +08:00
sya e3317df720 Merge branch 'master' of http://47.106.207.27:3000/sh_stu0814/max_code_test_gitea_2 2026-09-21 21:28:31 +08:00
wangbo_stu 367acf4099 Merge pull request '小组内俩俩完成一次冲突的处理并截图' (#8) from dev-wangbo into master
Reviewed-on: #8
2026-09-21 21:19:55 +08:00
wangbo_stu a03f020ad5 小组内俩俩完成一次冲突的处理并截图 2026-09-21 21:12:20 +08:00
sh_stu0814 87a8505d66 Merge pull request '我加了一个xxod' (#3) from featureA into master
Reviewed-on: #3
2026-09-21 21:07:31 +08:00
sya 879ad1ca47 2s 2026-09-21 21:07:20 +08:00
david 1901e7b510 fix:解决冲突 2026-09-21 21:06:16 +08:00
sh_stu0814 e7a6d46596 Merge pull request 'aa' (#5) from fen_sh into master
Reviewed-on: #5
2026-09-21 21:01:21 +08:00
jianqi 356d050f0f ww 2026-09-21 21:01:06 +08:00
jianqi e609bb1492 aa 2026-09-21 20:58:21 +08:00
sh_stu0814 57b5594a86 Merge pull request 'add_he' (#4) from hzh into master
Reviewed-on: #4
2026-09-21 20:57:35 +08:00
sh_stu0814 9b76a1bc8e Merge branch 'master' into hzh 2026-09-21 20:57:22 +08:00
hzh be4e3a96bb add_he 2026-09-21 20:56:23 +08:00
sh_stu0814 169be026dd Merge pull request 'sh_1' (#2) from fen_sh into master
Reviewed-on: #2
2026-09-21 20:54:35 +08:00
jianqi 423117e2f5 解决 test_3.txt 合并冲突 2026-09-21 20:54:06 +08:00
sh_stu0814 f0b17e29c6 Merge pull request 'hzh_update_test_3' (#1) from hzh into master
Reviewed-on: #1
2026-09-21 20:50:54 +08:00
jianqi 0d02a2a353 sh_1 2026-09-21 20:46:17 +08:00
david d2a37f76fb 我加了一个xxod 2026-09-21 20:46:11 +08:00
hzh 713aae429a hzh_update_test_3 2026-09-21 20:46:03 +08:00
jianqi a177745f10 "1_test_files" 2026-09-21 20:41:22 +08:00
jianqi 2b9fb53b8d first test 2026-09-21 20:27:33 +08:00
jianqi e8be87eca0 第五版_完整 2026-09-14 16:39:48 +08:00
jianqi c2909191d2 第四版_完整 2026-09-14 15:23:26 +08:00
jianqi 06c329fdd1 第三版_完整 2026-09-14 11:51:13 +08:00
jianqi 40a269b751 第二版_完整 2026-09-14 11:38:04 +08:00
jianqi 414de4bad8 第一版_完整 2026-09-14 11:34:08 +08:00
曾靖宇 e8646724b4 Merge remote-tracking branch 'origin/master' 2026-09-12 15:03:09 +08:00
曾靖宇 eacf393e75 新增stu_model学生信息表模型 2026-09-12 14:50:21 +08:00
沃林项目1 3e4cdee9be 学生成绩模型 2026-09-12 14:50:21 +08:00
hzh 076da95fa5 Merge remote-tracking branch 'origin/master' 2026-09-12 14:48:29 +08:00
hzh bd1a9c2fdc 新增cls_mgmt_model 2026-09-12 14:46:58 +08:00
天天 66600ead67 Merge remote-tracking branch 'origin/master' 2026-09-12 14:45:08 +08:00
天天 77ce48310a 创建teacher_model 2026-09-12 14:42:26 +08:00
jianqi e7175958c7 修改main文件
新增统计api
新增统计请求模型
2026-09-12 14:32:31 +08:00
jianqi 5078d4d0c9 基础文件更新一下配置 2026-09-12 13:59:38 +08:00
jianqi 641af3d126 初次代码 2026-09-11 23:46:30 +08:00
jianqi 0db571e0d8 初次代码 2026-09-11 23:43:59 +08:00
jianqi cea442451d 初次代码 2026-09-11 23:40:12 +08:00