 Orangeeee
|
6a39e1d56f
|
Merge remote-tracking branch 'origin/xiaoyang_score' into lon_students_merge_code_test
|
2026-09-22 18:02:33 +08:00 |
|
 chen
|
1558103dfa
|
外键
|
2026-09-22 18:00:55 +08:00 |
|
|
chen
|
5c671020d7
|
外键
|
2026-09-22 17:55:57 +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 |
|
 Coffee
|
5020eeb640
|
statcalc就业统计模块更新
|
2026-09-22 17:02:59 +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 |
|
|
Coffee
|
10cf1b64e8
|
修改外键
|
2026-09-22 16:55:05 +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 |
|
|
chen
|
de85f8ef06
|
外键
|
2026-09-22 15:58:34 +08:00 |
|
 geyuan
|
daed5971ea
|
增加科目表的id
|
2026-09-22 15:33:09 +08:00 |
|
|
Orangeeee
|
e2ccae757c
|
新增databases.py把所有建表基类统一成一个，才可以链接外键。
|
2026-09-22 15:32:34 +08:00 |
|
|
Coffee
|
a6b1e3b0de
|
修正注释信息
|
2026-09-22 15:19:43 +08:00 |
|
|
geyuan
|
6de3d1dd22
|
更新科目表
|
2026-09-22 15:19:19 +08:00 |
|
|
Orangeeee
|
8f39d5456a
|
新增databases.py把所有建表基类统一成一个，才可以链接外键。
|
2026-09-22 15:14:32 +08:00 |
|
|
geyuan
|
a415a7c35e
|
更新架构功能的文字介绍
|
2026-09-22 14:39:20 +08:00 |
|
|
geyuan
|
d99eb7367d
|
增加逻辑删除的查询条件
|
2026-09-22 14:36:10 +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 |
|
|
geyuan
|
273bee1ea2
|
改bug
|
2026-09-22 13:54:00 +08:00 |
|
|
Orangeeee
|
f736845b6f
|
分支合并，调整完毕，可以运行，可以拉取该分支进行修改bug。
|
2026-09-22 13:44:05 +08:00 |
|
 Anhoa
|
28e0401383
|
更改文件导入路径
|
2026-09-22 13:38:28 +08:00 |
|
|
Coffee
|
fb94d03bb6
|
添加from文件夹名
|
2026-09-22 13:34:34 +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 |
|
|
geyuan
|
81e9a2c534
|
框架
|
2026-09-22 13:04:50 +08:00 |
|
|
geeker
|
48080554a7
|
测试验证统一环境
|
2026-09-22 13:04:26 +08:00 |
|
|
Anhoa
|
23e29d7f1a
|
更改文件导入路径和部分功能更新
|
2026-09-22 12:31:52 +08:00 |
|
|
Coffee
|
2cc3829c88
|
添加from文件夹名
|
2026-09-22 12:28:06 +08:00 |
|
|
Orangeeee
|
cae04fd04a
|
尝试合并，所有代码需要调整from后文件路径。
|
2026-09-22 12:23:18 +08:00 |
|
|
chen
|
1fe2b6bc60
|
增删改查基本完成
|
2026-09-22 11:45:25 +08:00 |
|
|
Coffee
|
5ced78a009
|
更新debug
|
2026-09-22 11:42:27 +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 |
|
|
chen
|
8a1022390f
|
增删改查还在调试添加
|
2026-09-22 11:02:17 +08:00 |
|
|
geyuan
|
4460a16848
|
改新buge
|
2026-09-22 11:00:36 +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 |
|
|
Anhoa
|
fee9e14768
|
修改字段 和表名
|
2026-09-22 10:50:34 +08:00 |
|
|
Coffee
|
29dd7e1e04
|
更新字段
|
2026-09-22 10:48:49 +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 |
|