Commit Graph

676 Commits

Author SHA1 Message Date
白了个白 dfd53637be 作业管理:习题上传页面加上返回 2024-12-17 17:20:53 +08:00
白了个白 c01a29bf3f 习题上传:扫描识别url修改 2024-12-17 17:20:30 +08:00
zhangxuelin 436bdfe7c8 Merge pull request 'zxl' (#145) from zxl into main
Reviewed-on: #145
2024-12-17 10:28:58 +08:00
zhangxuelin 2d0be935bf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-17 10:26:51 +08:00
zhangxuelin d6dfe966c0 pptist 比例修改 2024-12-17 10:26:41 +08:00
zdg cf7f985020 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-16 17:49:09 +08:00
zdg 5d6c946e08 更新 2024-12-16 17:49:04 +08:00
“zouyf” 9a2a55c62b 1 2024-12-16 17:30:00 +08:00
“zouyf” 19efe185c5 Merge branch 'main' into zouyf_dev 2024-12-16 17:14:22 +08:00
“zouyf” 78ecf6ea55 [查询试题] - 单元查询优化 2024-12-16 17:13:56 +08:00
yangws 55efc7f3e1 Merge pull request 'fix:修复头像问题;' (#144) from yws_dev into main
Reviewed-on: #144
2024-12-16 17:06:28 +08:00
小杨 122c5341e9 fix:修复头像问题; 2024-12-16 17:06:01 +08:00
朱浩 c2a4f2c708 Merge remote-tracking branch 'origin/main' 2024-12-16 16:46:22 +08:00
yangws eb18344b6b Merge pull request 'yws_dev' (#143) from yws_dev into main
Reviewed-on: #143
2024-12-16 16:41:13 +08:00
小杨 e080e39e1c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-16 16:40:43 +08:00
小杨 25f09cb4e0 fix:头像类型修改; 2024-12-16 16:40:33 +08:00
朱浩 3b67c34ccb Merge remote-tracking branch 'origin/main' 2024-12-16 16:20:53 +08:00
朱浩 187c222fe5 大模型页面补全 2024-12-16 16:20:30 +08:00
lyc a255b1af71 Merge pull request 'edit 模板' (#142) from lyc-dev into main 2024-12-16 16:18:02 +08:00
lyc 546c8ad72f edit 模板 2024-12-16 16:17:32 +08:00
zhengdegang e58cb334e4 Merge pull request 'ppt -优化活动列表' (#141) from zdg_dev into main
Reviewed-on: #141
2024-12-16 15:03:14 +08:00
zdg c298e1c0a2 ppt -优化活动列表 2024-12-16 15:01:07 +08:00
朱浩 ed8051d0e0 Merge remote-tracking branch 'origin/main' 2024-12-16 14:24:16 +08:00
朱浩 628055fb58 大模型页面补全 2024-12-16 14:24:00 +08:00
zhengdegang 1698ce30dd Merge pull request '更新ppt活动' (#140) from zdg_dev into main
Reviewed-on: #140
2024-12-16 12:18:57 +08:00
zdg a973d296fe 更新ppt活动 2024-12-16 12:18:19 +08:00
zhangxuelin bf4b857eb7 Merge pull request 'zxl' (#139) from zxl into main
Reviewed-on: #139
2024-12-16 10:19:55 +08:00
zhangxuelin 79839458f0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-16 10:19:14 +08:00
zhangxuelin d018a28200 添加注册验证码倒计时 2024-12-16 10:19:04 +08:00
zhengdegang 2214c5d805 Merge pull request 'ppt上课 拖动更新排序 动画播放等' (#138) from zdg_dev into main
Reviewed-on: #138
2024-12-16 10:16:14 +08:00
zdg 9ad959dfb7 ppt上课 拖动更新排序 动画播放等 2024-12-16 10:15:08 +08:00
lyc 0b9fce21f3 Merge pull request 'edit' (#137) from lyc-dev into main 2024-12-16 10:06:40 +08:00
lyc 37d0592dcc edit 2024-12-16 10:06:14 +08:00
yangws a421ca94bc Merge pull request 'fix:修改监听活动的方式;' (#136) from yws_dev into main
Reviewed-on: #136
2024-12-16 09:56:18 +08:00
小杨 6eda37c8c9 fix:修改监听活动的方式; 2024-12-16 09:55:48 +08:00
lyc 2a11173874 Merge pull request 'lyc-dev' (#135) from lyc-dev into main 2024-12-16 09:50:59 +08:00
lyc 88869e9a8a Merge branch 'main' into lyc-dev 2024-12-16 09:50:30 +08:00
lyc 08db70a3f2 edit 2024-12-16 09:50:17 +08:00
yangws f9efb76282 Merge pull request 'fix:修改头像是取消头像消失的问题;' (#134) from yws_dev into main
Reviewed-on: #134
2024-12-13 14:01:33 +08:00
小杨 ec3d728896 fix:修改头像是取消头像消失的问题; 2024-12-13 14:01:13 +08:00
yangws cb0ab7f2e9 Merge pull request 'fix:ppt活动类型判断;' (#133) from yws_dev into main
Reviewed-on: #133
2024-12-13 13:48:19 +08:00
小杨 43e9c9f44e fix:ppt活动类型判断; 2024-12-13 13:47:56 +08:00
yangws 809c639ce9 Merge pull request 'fix:头像问题;' (#132) from yws_dev into main
Reviewed-on: #132
2024-12-13 13:46:49 +08:00
小杨 243561dfd8 fix:头像问题; 2024-12-13 13:45:06 +08:00
zhengdegang e5bc693f66 Merge pull request 'zdg_dev' (#131) from zdg_dev into main
Reviewed-on: #131
2024-12-13 13:18:09 +08:00
zdg 29888b0674 ppt播放 已经翻页异常情况 2024-12-13 13:17:18 +08:00
zdg 645f9ab120 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-13 13:16:31 +08:00
朱浩 74767b44df Merge remote-tracking branch 'origin/main' 2024-12-13 13:01:34 +08:00
朱浩 ef4ec36bbe 大模型页面补全 2024-12-13 13:00:02 +08:00
zdg c4a15e9c53 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-13 12:46:51 +08:00