Commit Graph

786 Commits

Author SHA1 Message Date
zhangxuelin 490536654a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-12 10:51:38 +08:00
zhangxuelin 2efb870a16 添加注册提示 2024-09-12 10:51:12 +08:00
yangws 5778a8955d Merge pull request 'fix: 提示教材没有时选择教材;' (#200) from yangws into main
Reviewed-on: #200
2024-09-12 09:48:40 +08:00
朱浩 e4e23e7508 Merge pull request '排序问题处理' (#199) from zhuhao_dev into main
Reviewed-on: #199
2024-09-12 09:48:14 +08:00
yangws 6a33ea8023 fix: 提示教材没有时选择教材; 2024-09-12 09:47:46 +08:00
朱浩 bc0579fa32 排序问题处理 2024-09-12 09:47:35 +08:00
yangws 3357cf8a78 Merge pull request 'fix: 样式修改,以及第三方资源名称不对应的情况;' (#198) from yangws into main
Reviewed-on: #198
2024-09-12 09:31:57 +08:00
yangws 3fdf500366 fix: 样式修改,以及第三方资源名称不对应的情况; 2024-09-12 09:30:44 +08:00
zhengdegang e985417675 Merge pull request 'zdg' (#197) from zdg into main
Reviewed-on: #197
2024-09-11 20:06:20 +08:00
zdg 1978d1bac1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 20:05:30 +08:00
zdg b9014b950a 密码找回 2024-09-11 20:05:18 +08:00
lyc 03ecbb1d50 Merge pull request 'ai助手-拖动' (#196) from lyc-dev into main 2024-09-11 16:51:56 +08:00
lyc ec3b978185 ai助手-拖动 2024-09-11 16:50:47 +08:00
zdg 3632beebfa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 16:17:16 +08:00
zdg f0e87338fb 注册优化,修复 2024-09-11 16:17:05 +08:00
lyc 54266f8a37 Merge pull request '图片' (#195) from lyc-dev into main 2024-09-11 16:05:04 +08:00
lyc 82bed1be03 图片 2024-09-11 16:04:36 +08:00
lyc 8a74f17266 Merge pull request '头部展示学科' (#194) from lyc-dev into main 2024-09-11 15:42:39 +08:00
lyc 40c6e1303b 头部展示学科 2024-09-11 15:39:54 +08:00
yangws ee196b6eb8 Merge pull request 'fix:解决个人中心班级限制问题;' (#193) from yangws into main
Reviewed-on: #193
2024-09-11 14:43:25 +08:00
yangws 6c60cd4442 fix:解决个人中心班级限制问题; 2024-09-11 14:42:48 +08:00
baigl 471d73a224 Merge pull request '作业批阅:新增空列表展示与loading加载效果' (#192) from baigl into main
Reviewed-on: #192
2024-09-11 14:30:31 +08:00
白了个白 d7761883f2 作业批阅:新增空列表展示与loading加载效果 2024-09-11 14:22:05 +08:00
baigl d4b1e547de Merge pull request 'baigl' (#191) from baigl into main
Reviewed-on: #191
2024-09-11 11:29:52 +08:00
白了个白 b34182eb39 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-11 11:28:03 +08:00
白了个白 300093cf74 作业批改优化:新增时间筛选接口 界面调整 2024-09-11 11:25:41 +08:00
yangws aaf03eb60d Merge pull request 'fix:样式问题;' (#190) from yangws into main
Reviewed-on: #190
2024-09-11 09:49:07 +08:00
yangws 08075746c0 fix:样式问题; 2024-09-11 09:48:27 +08:00
yangws 8ec93353bc Merge pull request 'fix:修改添加的班级;' (#189) from yangws into main
Reviewed-on: #189
2024-09-10 17:56:33 +08:00
yangws 68df866db5 fix:修改添加的班级; 2024-09-10 17:55:48 +08:00
朱浩 add564c4ed Merge pull request 'zhuhao_dev' (#188) from zhuhao_dev into main
Reviewed-on: #188
2024-09-10 17:22:22 +08:00
朱浩 77e76fcf7d 版本升级2.0 2024-09-10 17:21:49 +08:00
朱浩 0268f1af36 Merge branch 'main' into zhuhao_dev 2024-09-10 17:17:38 +08:00
朱浩 278dfd4d93 章节排序 2024-09-10 17:17:10 +08:00
lyc db6ebbdbaf Merge pull request 'lyc-dev' (#187) from lyc-dev into main 2024-09-10 17:10:04 +08:00
lyc e2017c3553 冲突-file-preview 2024-09-10 17:09:50 +08:00
lyc 0be3d131e2 聊天机器人 2024-09-10 17:07:00 +08:00
yangws 8ec738de46 Merge pull request 'add:新增加入班级;' (#185) from yangws into main
Reviewed-on: #185
2024-09-10 16:50:30 +08:00
yangws 076a510109 add:新增加入班级; 2024-09-10 16:49:11 +08:00
zhangxuelin ee9e5d1326 Merge pull request 'zdg' (#184) from zdg into main
Reviewed-on: #184
2024-09-10 16:16:44 +08:00
zhangxuelin 7ed7b2efd2 添加跳转apt页面 2024-09-10 15:21:46 +08:00
zhangxuelin eaf2d82ead Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-10 15:06:39 +08:00
朱浩 786c6816ec Merge pull request 'zhuhao_dev' (#183) from zhuhao_dev into main
Reviewed-on: #183
2024-09-10 15:04:51 +08:00
朱浩 1b504a1653 Merge branch 'main' into zhuhao_dev 2024-09-10 15:04:18 +08:00
朱浩 85c61ca802 APT入口开发 2024-09-10 15:03:42 +08:00
zhangxuelin 7da1d97939 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-10 14:57:19 +08:00
baigl 3603c4e0f2 Merge pull request 'baigl' (#182) from baigl into main
Reviewed-on: #182
2024-09-10 14:11:05 +08:00
白了个白 cb1c3c23fe Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-10 14:10:10 +08:00
白了个白 de1dee7380 题目转义判断 2024-09-10 14:09:50 +08:00
zhangxuelin 151cdbb1a1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	electron.vite.config.mjs
2024-09-10 14:07:04 +08:00