 李鹏宇
|
7601338f99
|
完善教育
|
2026-09-11 16:45:58 +08:00 |
|
|
李鹏宇
|
ed36f20beb
|
完善教育
|
2026-09-10 19:36:08 +08:00 |
|
|
李鹏宇
|
102a8ca4e1
|
Merge remote-tracking branch 'origin/zhou' into zhou
|
2026-09-10 15:18:19 +08:00 |
|
|
李鹏宇
|
c3b994ca86
|
实训模块
|
2026-09-10 15:16:46 +08:00 |
|
|
李鹏宇
|
148ba8b6c0
|
Merge branch 'master' into zhou
|
2026-08-27 20:03:10 +08:00 |
|
|
zhouxufan
|
cd68aa8c72
|
Merge pull request 'Master' (#34) from master into zhou
Reviewed-on: #34
|
2026-08-27 20:01:06 +08:00 |
|
|
李鹏宇
|
c60acb1984
|
完善教育
|
2026-08-27 19:53:56 +08:00 |
|
|
wanghaoyang
|
6bb6e7fc6d
|
Merge pull request '翻译' (#32) from wanghy into master
Reviewed-on: #32
|
2026-08-24 18:39:31 +08:00 |
|
|
李鹏宇
|
e5c26c260d
|
翻译
|
2026-08-24 18:37:05 +08:00 |
|
|
zhouxufan
|
52f3a92f6b
|
Merge pull request '完善教育' (#31) from zhou into master
Reviewed-on: #31
|
2026-08-21 19:31:14 +08:00 |
|
|
李鹏宇
|
4c03ef6a90
|
完善教育
|
2026-08-21 19:30:28 +08:00 |
|
|
zhouxufan
|
67aabfc2c1
|
Merge pull request '完善教育' (#30) from zhou into master
Reviewed-on: #30
|
2026-08-21 19:26:42 +08:00 |
|
|
李鹏宇
|
b072b7f973
|
完善教育
|
2026-08-21 19:25:35 +08:00 |
|
|
zhouxufan
|
dc36d6f3c8
|
Merge pull request '完善教育' (#29) from zhou into master
Reviewed-on: #29
|
2026-08-14 17:18:35 +08:00 |
|
|
李鹏宇
|
87f2003caa
|
完善教育
|
2026-08-14 17:17:01 +08:00 |
|
|
zhouxufan
|
8a653407f2
|
Merge pull request '完善教育' (#28) from zhou into master
Reviewed-on: #28
|
2026-08-12 17:12:55 +08:00 |
|
|
李鹏宇
|
d08668ca8a
|
完善教育
|
2026-08-12 17:06:11 +08:00 |
|
|
zhouxufan
|
522562eaa0
|
Merge pull request '完善教育' (#26) from zhou into master
Reviewed-on: #26
|
2026-08-11 18:14:59 +08:00 |
|
|
李鹏宇
|
ba80a569e9
|
完善教育
|
2026-08-11 18:13:51 +08:00 |
|
|
zhouxufan
|
6452d6b8fc
|
Merge pull request '完善教育' (#25) from zhou into master
Reviewed-on: #25
|
2026-08-10 15:38:40 +08:00 |
|
|
李鹏宇
|
9d3f94c966
|
完善教育
|
2026-08-10 15:36:57 +08:00 |
|
|
zhouxufan
|
7cdb9b6651
|
Merge pull request '完善教育' (#24) from zhou into master
Reviewed-on: #24
|
2026-08-10 10:49:21 +08:00 |
|
|
李鹏宇
|
651a7d94ba
|
完善教育
|
2026-08-10 10:48:26 +08:00 |
|
|
zhouxufan
|
10bc7f990e
|
Merge pull request '完善教育' (#23) from zhou into master
Reviewed-on: #23
|
2026-08-07 19:00:34 +08:00 |
|
|
李鹏宇
|
df06c81be0
|
完善教育
|
2026-08-07 18:59:56 +08:00 |
|
|
zhouxufan
|
6b166d1f34
|
Merge pull request '完善教育' (#22) from zhou into master
Reviewed-on: #22
|
2026-08-07 18:53:46 +08:00 |
|
|
李鹏宇
|
2ba9f5297a
|
完善教育
|
2026-08-07 18:53:16 +08:00 |
|
|
zhouxufan
|
923a0d7e03
|
Merge pull request 'zhou' (#21) from zhou into master
Reviewed-on: #21
|
2026-08-07 18:46:03 +08:00 |
|
|
李鹏宇
|
64b0e18a74
|
Merge branch 'master' into zhou
|
2026-08-07 18:45:34 +08:00 |
|
|
李鹏宇
|
e98be48f2c
|
完善教育
|
2026-08-07 18:45:07 +08:00 |
|
|
wanghaoyang
|
49d4fb1c5c
|
Merge pull request '菜单显示，登录卡片' (#20) from wanghy into master
Reviewed-on: #20
|
2026-08-07 18:17:17 +08:00 |
|
|
李鹏宇
|
0d2c9e890a
|
菜单显示，登录卡片
|
2026-08-07 18:16:09 +08:00 |
|
|
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 |
|