Commit Graph

702 Commits

Author SHA1 Message Date
yangws ba35677947 Merge pull request 'add:添加实验室;' (#154) from yws_dev into main
Reviewed-on: #154
2024-12-19 17:27:53 +08:00
lyc 4b393ecec9 add:添加实验室; 2024-12-19 17:26:53 +08:00
lyc 2565481306 Merge pull request 'lyc-dev' (#153) from lyc-dev into main 2024-12-19 16:56:31 +08:00
lyc f708e2f741 Merge branch 'main' into lyc-dev 2024-12-19 16:55:52 +08:00
lyc 94276db542 edit 2024-12-19 16:55:37 +08:00
zhengdegang 6ef5d4575e Merge pull request 'zdg_dev' (#152) from zdg_dev into main
Reviewed-on: #152
2024-12-19 16:49:25 +08:00
zdg dfc10aebbe pptlist公屏上课 2024-12-19 16:48:43 +08:00
zdg ff6fab0bcc Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-19 11:14:19 +08:00
zdg 45abab7a41 公屏上课 2024-12-19 11:14:14 +08:00
朱浩 6128f267e1 Merge remote-tracking branch 'origin/main' 2024-12-19 11:07:27 +08:00
朱浩 e0a406c497 新增宫格查看插件 2024-12-19 11:07:12 +08:00
lyc cebf864b82 Merge pull request '模板修改' (#151) from lyc-dev into main 2024-12-18 17:31:44 +08:00
lyc 0ed69394ef 模板修改 2024-12-18 17:31:10 +08:00
lyc 0b6039f9d8 Merge pull request '白板按钮图标不显示' (#150) from lyc-dev into main 2024-12-18 17:17:15 +08:00
lyc 627c70d0e1 白板按钮图标不显示 2024-12-18 17:16:23 +08:00
zhangxuelin 64272467a2 ppist里面不显示导入 2024-12-18 16:08:19 +08:00
zhengdegang 792ab3284f Merge pull request 'zdg_dev' (#149) from zdg_dev into main
Reviewed-on: #149
2024-12-18 16:01:31 +08:00
zdg 38a50d18bf 注释 2024-12-18 16:00:31 +08:00
zdg 6fa0aa6e5f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-18 15:59:51 +08:00
zdg b0fca4ad9b ppt上课-全屏演讲者
点赞修复
2024-12-18 15:59:45 +08:00
lyc 9381785991 Merge pull request 'lyc-dev' (#148) from lyc-dev into main 2024-12-18 11:17:53 +08:00
lyc 28561b5016 Merge branch 'main' into lyc-dev 2024-12-18 11:17:25 +08:00
lyc 2e2ebbd47f 模板新增 模型选择 2024-12-18 11:17:09 +08:00
baigl 2b5b365e2f Merge pull request 'baigl' (#147) from baigl into main
Reviewed-on: #147
2024-12-18 09:54:29 +08:00
白了个白 90ac7a49c7 1 2024-12-18 09:53:39 +08:00
白了个白 75ddbf6f26 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-18 09:52:08 +08:00
白了个白 de9235751f 作业管理:习题上传后,返回进入 个人题库界面 2024-12-18 09:51:44 +08:00
zhengdegang c33c0d923e Merge pull request 'zdg_dev' (#146) from zdg_dev into main
Reviewed-on: #146
2024-12-17 17:36:33 +08:00
zdg 94fa1a2457 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-17 17:35:57 +08:00
zdg abce344d42 ppt 动画 2024-12-17 17:35:48 +08:00
zdg 0d38a12094 ppt 2024-12-17 17:34:47 +08:00
白了个白 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
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