Commit Graph
38 Commits
Author SHA1 Message Date
Orangeeee 6775da7f89 统计分析模块更新,待测试,成绩模块更新。 2026-09-22 18:23:13 +08:00
Orangeeee 6a39e1d56f Merge remote-tracking branch 'origin/xiaoyang_score' into lon_students_merge_code_test 2026-09-22 18:02:33 +08:00
Orangeeee 657f97cc38 Merge remote-tracking branch 'origin/lon_students_merge_code_test_coffee' into lon_students_merge_code_test 2026-09-22 17:32:42 +08:00
Orangeeee 0cdecadd79 Merge remote-tracking branch 'origin/coffee_all' into lon_students_merge_code_test 2026-09-22 16:58:57 +08:00
Orangeeee eb4e4c1cc0 Merge remote-tracking branch 'origin/cyf_class_management' into lon_students_merge_code_test
# Conflicts:
#	class_management/database.py
#	class_management/main.py
#	class_management/model/class_management_model.py
#	pyproject.toml
#	uv.lock
2026-09-22 16:52:49 +08:00
Orangeeee 214d15251e Merge remote-tracking branch 'origin/coffee_all' into lon_students_merge_code_test
# Conflicts:
#	stu_jiuye/database.py
#	stu_jiuye/main.py
2026-09-22 16:48:37 +08:00
Orangeeee c90c9a06e8 Merge remote-tracking branch 'origin/geyuan_hhy_teacher' into lon_students_merge_code_test
# Conflicts:
#	README.md
2026-09-22 16:45:53 +08:00
Orangeeee c654e7d972 Merge remote-tracking branch 'origin/xiaoyang_score' into lon_students_merge_code_test
# Conflicts:
#	scores/main.py
#	scores/model/score_model.py
2026-09-22 16:45:12 +08:00
Orangeeee f6aa668139 新增StatCalc文件夹,统计分析模块,初步框架搭建。 2026-09-22 16:38:38 +08:00
Orangeeee e2ccae757c 新增databases.py把所有建表基类统一成一个,才可以链接外键。 2026-09-22 15:32:34 +08:00
Orangeeee 8f39d5456a 新增databases.py把所有建表基类统一成一个,才可以链接外键。 2026-09-22 15:14:32 +08:00
Orangeeee f6e4cdedfc 新增.env模板。 2026-09-22 14:04:29 +08:00
Orangeeee 1b00ea1fad 新增.env模板。 2026-09-22 14:04:05 +08:00
Orangeeee 99a3f70349 新增.env模板。 2026-09-22 14:00:32 +08:00
Orangeeee f736845b6f 分支合并,调整完毕,可以运行,可以拉取该分支进行修改bug。 2026-09-22 13:44:05 +08:00
Orangeeee 4033dd86c1 Merge remote-tracking branch 'origin/cyf_class_management' into lon_students_merge_code_test
# Conflicts:
#	class_management/database.py
#	class_management/main.py
2026-09-22 13:27:18 +08:00
Orangeeee ee548328d5 Merge remote-tracking branch 'origin/coffee_jiuye' into lon_students_merge_code_test
# Conflicts:
#	.idea/.gitignore
#	stu_jiuye/database.py
#	stu_jiuye/main.py
2026-09-22 13:22:52 +08:00
Orangeeee 4e929295e3 分支合并。 2026-09-22 13:12:15 +08:00
Orangeeee 37a5de11b8 尝试合并,修改主main.py。 2026-09-22 13:06:58 +08:00
Orangeeee fabe78cbcc 尝试合并,所有代码需要调整from后文件路径。 2026-09-22 13:04:53 +08:00
Orangeeee cae04fd04a 尝试合并,所有代码需要调整from后文件路径。 2026-09-22 12:23:18 +08:00
Orangeeee 73da38f445 students文件夹内新增main,用于整合链接到主main。 2026-09-22 11:16:51 +08:00
Orangeeee 68105a39d5 Merge branch 'lon_students' into lon_students_merge_code_test 2026-09-22 11:12:47 +08:00
Orangeeee 8ea5fcb5b8 students文件夹内新增main,用于整合链接到主main。 2026-09-22 11:12:15 +08:00
Orangeeee ac545d0782 Merge remote-tracking branch 'origin/xiaoyang_score' into lon_students_merge_code_test 2026-09-22 11:03:51 +08:00
Orangeeee 763fd4cb45 Merge remote-tracking branch 'origin/geyuan_hhy_teacher' into lon_students_merge_code_test
# Conflicts:
#	.idea/.gitignore
2026-09-22 11:03:04 +08:00
Orangeeee be2bbcb5ee Merge remote-tracking branch 'origin/cyf_class_management' into lon_students_merge_code_test 2026-09-22 10:56:50 +08:00
Orangeeee 67c3cd0452 Merge remote-tracking branch 'origin/coffee_jiuye' into lon_students_merge_code_test 2026-09-22 10:48:43 +08:00
Orangeeee b4be2b083c Merge remote-tracking branch 'origin/xiaoyang_score' into lon_students_merge_code_test 2026-09-22 10:48:11 +08:00
Orangeeee 66ca2cc8b7 Merge remote-tracking branch 'origin/cyf_class_management' into lon_students_merge_code_test
# Conflicts:
#	main.py
#	requirements.txt
2026-09-22 10:46:23 +08:00
Orangeeee c8961950ea 同步业务名称导致需要同步修改业务代码,现全部更新完毕,初步测试增删改查没有问题。 2026-09-22 10:08:56 +08:00
Orangeeee fe7c95fa78 更新同步 所有库名、表名、model字段名 等,导致需要同步修改业务代码,现更新到update的request、api和dao了,暂存。 2026-09-21 23:11:45 +08:00
Orangeeee 1f87616004 小组更新同步 所有库名、表名、model字段名 等。 2026-09-21 21:49:16 +08:00
Orangeeee e71ac77c76 更新 README_students.md 模块解释。 2026-09-21 19:04:09 +08:00
Orangeeee 3edce70bbb 修改delete相关代码逻辑,新增README_students.md用来做模块解释。 2026-09-21 18:07:01 +08:00
Orangeeee e9507fef26 基础框架内容已经搭建完毕,剩余外键还未链接。 2026-09-21 12:20:53 +08:00
Orangeeee 1f4fa614e5 更新所有模块框架,建表已写好,学生查询模块已经写好,正在写新增模块。 2026-09-21 08:41:49 +08:00
Orangeeee 4627b4a57a 删除原分支,新增配置环境后的新分支,同步构建新框架 2026-09-21 03:32:57 +08:00