 朱浩
|
16b574a167
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-10-16 14:31:55 +08:00 |
|
朱浩
|
8a90da5b64
|
接入AI生成PPT的功能
|
2024-10-16 14:29:43 +08:00 |
|
朱浩
|
d1f3abcc72
|
#882 V2.1.5 教学实录只记录已结束课程，添加继续上课逻辑
|
2024-10-16 10:58:42 +08:00 |
|
朱浩
|
d39d96f733
|
Merge branch 'main' into zhuhao_dev
|
2024-10-16 09:33:29 +08:00 |
|
朱浩
|
fe9e0c1fe2
|
删除沉余代码
|
2024-10-15 17:47:32 +08:00 |
|
朱浩
|
7fa76e0f7e
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/classManage/reserv-item-apt.vue
# src/renderer/src/views/prepare/container/kj-list-item.vue
|
2024-10-15 15:40:08 +08:00 |
|
朱浩
|
b3e75e799e
|
Merge branch 'main' into zhuhao_dev
|
2024-10-15 09:23:04 +08:00 |
|
朱浩
|
81cd69beb9
|
暂时取消APT的上课判断
|
2024-10-11 17:31:12 +08:00 |
|
朱浩
|
0bb03dad5e
|
暂时取消APT的上课判断
|
2024-10-11 16:40:07 +08:00 |