zhouxufan
|
809459e2eb
|
Merge pull request '完善教育' (#19) from zhou into master
Reviewed-on: #19
|
2026-08-07 16:10:17 +08:00 |
|
李鹏宇
|
ca105fc4ea
|
完善教育
|
2026-08-07 16:09:46 +08:00 |
|
wanghaoyang
|
19a294bd2d
|
Merge pull request '菜单显示' (#18) from wanghy into master
Reviewed-on: #18
|
2026-08-07 15:45:12 +08:00 |
|
李鹏宇
|
f42c3d13ee
|
菜单显示
|
2026-08-07 15:40:38 +08:00 |
|
wanghaoyang
|
ca60dff018
|
Merge pull request '加载顺序问题' (#17) from wanghy into master
Reviewed-on: #17
|
2026-08-07 15:23:41 +08:00 |
|
李鹏宇
|
5ff714f1d6
|
加载顺序问题
|
2026-08-07 15:22:04 +08:00 |
|
zhouxufan
|
eb7c87fad1
|
Merge pull request 'zhou' (#16) from zhou into master
Reviewed-on: #16
|
2026-08-07 12:14:40 +08:00 |
|
李鹏宇
|
9efb4bf916
|
Merge branch 'refs/heads/master' into zhou
# Conflicts:
# college/__manifest__.py
# college/models/__init__.py
# college/security/ir.model.access.csv
# college/static/src/img/about.png
|
2026-08-07 12:13:49 +08:00 |
|
李鹏宇
|
6fcad70326
|
模块迁移
|
2026-08-07 11:58:17 +08:00 |
|
wanghaoyang
|
1dd79a0411
|
Merge pull request '关于' (#14) from wanghy into master
Reviewed-on: #14
|
2026-08-07 11:50:41 +08:00 |
|
李鹏宇
|
ccdb5f7111
|
关于
|
2026-08-07 11:49:59 +08:00 |
|
wanghaoyang
|
068ff4c571
|
Merge pull request '关于' (#13) from wanghy into master
Reviewed-on: #13
|
2026-08-07 11:24:37 +08:00 |
|
李鹏宇
|
7adc6fc3c0
|
关于
|
2026-08-07 11:23:19 +08:00 |
|
wanghaoyang
|
54eb9c6ac9
|
Merge pull request '登录页面' (#12) from wanghy into master
Reviewed-on: #12
|
2026-08-07 10:35:09 +08:00 |
|
李鹏宇
|
ceb085c717
|
登录页面
|
2026-08-07 10:32:16 +08:00 |
|
wanghaoyang
|
8707f6d14d
|
Merge pull request '菜单,登录图片,随堂笔记' (#11) from wanghy into master
Reviewed-on: #11
|
2026-08-06 19:15:35 +08:00 |
|
zhouxufan
|
2733d863be
|
Merge pull request '新增功能' (#10) from zhou into master
Reviewed-on: #10
|
2026-08-06 19:15:05 +08:00 |
|
李鹏宇
|
a2bd6a5c78
|
模块迁移
|
2026-08-06 19:07:15 +08:00 |
|
李鹏宇
|
37d8d3facc
|
菜单,登录图片,随堂笔记
|
2026-08-06 19:05:26 +08:00 |
|
李鹏宇
|
dc8cea7659
|
模块迁移
|
2026-08-05 19:43:20 +08:00 |
|
李鹏宇
|
dc250f2ae2
|
模块迁移
|
2026-08-05 19:36:42 +08:00 |
|
李鹏宇
|
6b0e8fe493
|
模块迁移
|
2026-08-05 19:29:35 +08:00 |
|
李鹏宇
|
75c22679aa
|
模块迁移
|
2026-08-05 19:20:15 +08:00 |
|
李鹏宇
|
5c9cb7f8ff
|
模块迁移
|
2026-08-05 19:13:51 +08:00 |
|
李鹏宇
|
861144f615
|
模块迁移
|
2026-08-03 12:08:03 +08:00 |
|
李鹏宇
|
a7165e0ce6
|
模块迁移
|
2026-08-03 12:05:33 +08:00 |
|
李鹏宇
|
46c6e5af14
|
模块迁移
|
2026-08-03 12:04:46 +08:00 |
|
李鹏宇
|
3a26822e71
|
模块迁移
|
2026-08-03 12:03:31 +08:00 |
|
李鹏宇
|
eded38735a
|
模块迁移
|
2026-08-03 11:49:31 +08:00 |
|
李鹏宇
|
f453820775
|
模块迁移
|
2026-08-03 11:37:50 +08:00 |
|
李鹏宇
|
6efe2130b8
|
模块迁移
|
2026-08-03 11:07:03 +08:00 |
|
李鹏宇
|
72e9b84d56
|
模块迁移
|
2026-08-03 10:22:37 +08:00 |
|
李鹏宇
|
1a0d1c57e1
|
模块迁移
|
2026-08-03 10:19:39 +08:00 |
|
李鹏宇
|
67c61b7cd1
|
模块迁移
|
2026-08-03 10:17:53 +08:00 |
|
李鹏宇
|
8f6a9b3381
|
模块迁移
|
2026-08-03 10:00:02 +08:00 |
|
李鹏宇
|
59645cbed0
|
模块迁移
|
2026-08-03 09:59:10 +08:00 |
|
李鹏宇
|
84c8505cfb
|
模块迁移
|
2026-08-03 09:57:51 +08:00 |
|
李鹏宇
|
160c3dcb3a
|
模块迁移
|
2026-08-03 09:48:18 +08:00 |
|
李鹏宇
|
fe3585d589
|
模块迁移
|
2026-07-31 20:38:35 +08:00 |
|
李鹏宇
|
176da7546b
|
模块迁移
|
2026-07-31 20:38:10 +08:00 |
|
李鹏宇
|
cfe31fc044
|
模块迁移
|
2026-07-31 18:15:34 +08:00 |
|
李鹏宇
|
0d14744c15
|
模块迁移
|
2026-07-31 18:13:34 +08:00 |
|
李鹏宇
|
524aacbacb
|
模块迁移
|
2026-07-30 19:56:44 +08:00 |
|
李鹏宇
|
26c311d913
|
模块迁移
|
2026-07-28 18:50:48 +08:00 |
|
liuhaoran
|
36b6cb1e0e
|
Merge pull request 'dev_haoran' (#9) from dev_haoran into master
Reviewed-on: #9
|
2026-06-20 20:04:34 +08:00 |
|
liuhaoran
|
4803679f10
|
本地合并master,修复代码冲突
|
2026-06-20 20:03:48 +08:00 |
|
liuhaoran
|
2d8949202b
|
保存当前dev_haoran代码修改
|
2026-06-20 19:55:22 +08:00 |
|
liuhaoran
|
1baa361516
|
添加gitignore,永久忽略Python缓存
|
2026-06-20 19:48:40 +08:00 |
|
liuhaoran
|
0a1b8922db
|
删除仓库内无用的pyc缓存文件
|
2026-06-20 19:43:22 +08:00 |
|
liuhaoran
|
45fbe4fbba
|
更新
|
2026-06-20 19:32:29 +08:00 |
|