Commit Graph

669 Commits

Author SHA1 Message Date
“zouyf” f6b08169b6 Merge branch 'main' into zouyf_dev 2024-12-23 10:11:48 +08:00
朱浩 b1407706a8 永川个性化打包 2024-12-22 12:15:01 +08:00
朱浩 996b4006a2 永川个性化打包 2024-12-22 11:46:10 +08:00
朱浩 4531533382 大模型顺序问题修改 2024-12-21 21:42:07 +08:00
朱浩 a601a9f8dd Merge remote-tracking branch 'origin/main' 2024-12-21 21:40:07 +08:00
zhengdegang 086836e016 Merge pull request '1.pptList 实验室功能' (#168) from zdg_dev into main
Reviewed-on: #168
2024-12-21 12:17:04 +08:00
zdg acb0231304 1.pptList 实验室功能
2.pplList 批量更新缩略图
2024-12-21 12:15:58 +08:00
baigl 94e23c3d69 Merge pull request 'baigl' (#167) from baigl into main
Reviewed-on: #167
2024-12-20 17:19:17 +08:00
白了个白 ea5ed4b6ac Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 17:18:32 +08:00
白了个白 6b45fa61dd 1 2024-12-20 17:17:35 +08:00
白了个白 7aa75794dc 科学实验:批改优化 2024-12-20 17:16:57 +08:00
朱浩 a2c2c4eec7 Merge remote-tracking branch 'origin/main' 2024-12-20 17:14:40 +08:00
CYS 4095390f45 Merge pull request '插入素材' (#166) from cys_dev into main
Reviewed-on: #166
2024-12-20 17:12:50 +08:00
cys d75af2636d 插入素材 2024-12-20 17:12:07 +08:00
朱浩 1983dafbba Merge remote-tracking branch 'origin/main' 2024-12-20 16:52:18 +08:00
朱浩 6c7284383a 宫格图片插件 2024-12-20 16:52:02 +08:00
白了个白 f7a3aa6e53 科学实验:学科写死 2024-12-20 16:37:08 +08:00
baigl 28f79f7ab0 Merge pull request 'baigl' (#165) from baigl into main
Reviewed-on: #165
2024-12-20 16:07:29 +08:00
白了个白 1488d7cc03 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 16:06:55 +08:00
白了个白 045b44b833 1 2024-12-20 16:06:41 +08:00
baigl b47a3bb63a Merge pull request 'baigl' (#164) from baigl into main
Reviewed-on: #164
2024-12-20 16:02:49 +08:00
白了个白 5e954bab0b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 16:02:07 +08:00
白了个白 7322056dad 1 2024-12-20 16:01:46 +08:00
zhengdegang 18370129df Merge pull request 'zdg_dev' (#163) from zdg_dev into main
Reviewed-on: #163
2024-12-20 16:00:48 +08:00
zdg 0bf94af5a3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-20 16:00:14 +08:00
zdg 7b042fd001 ppt上课 工具栏 2024-12-20 16:00:09 +08:00
CYS 3bf381f5c5 Merge pull request '插入素材' (#162) from cys_dev into main
Reviewed-on: #162
2024-12-20 15:57:22 +08:00
cys fb67b16258 插入素材 2024-12-20 15:52:22 +08:00
baigl 016e87277b Merge pull request 'baigl' (#161) from baigl into main
Reviewed-on: #161
2024-12-20 15:45:01 +08:00
白了个白 502c772b46 1 2024-12-20 15:42:19 +08:00
白了个白 57cd8ea45a 1 2024-12-20 15:24:27 +08:00
白了个白 8bbd01e2b2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 15:24:02 +08:00
白了个白 622a71253f 作业设计:科学实验 2024-12-20 15:23:34 +08:00
“zouyf” af60c5cc17 Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-12-20 14:49:02 +08:00
“zouyf” e67756192a Merge branch 'main' into zouyf_dev 2024-12-20 14:48:30 +08:00
zouyf a2591c60bc Merge pull request '更新菁优网参数' (#160) from zouyf_tmp into main
Reviewed-on: #160
2024-12-20 14:45:40 +08:00
“zouyf” da8d6c4b32 更新菁优网参数 2024-12-20 14:44:59 +08:00
“zouyf” 73d4ee03ba Merge branch 'main' into zouyf_dev 2024-12-20 14:08:27 +08:00
“zouyf” 8863e05a1a Merge branch 'main' into zouyf_dev 2024-12-20 11:18:03 +08:00
朱浩 795c4d82c7 Merge remote-tracking branch 'origin/main' 2024-12-20 11:18:00 +08:00
朱浩 8e0b9f72d5 宫格图片插件 2024-12-20 11:16:44 +08:00
白了个白 4ad59a8b4e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-20 11:15:32 +08:00
白了个白 3de2ddb094 作业设计:新增 科学实验作业类型 2024-12-20 11:13:37 +08:00
zouyf 6dbd140f80 Merge pull request '[作业批改] - 增加科学实验的批改(同常规作业)' (#159) from zouyf_tmp into main
Reviewed-on: #159
2024-12-20 11:06:37 +08:00
“zouyf” 7bca2fdc2d [作业批改] - 增加科学实验的批改(同常规作业) 2024-12-20 11:05:22 +08:00
lyc ee96250af2 Merge pull request '隐藏教学工作台' (#158) from lyc-dev into main 2024-12-20 10:57:49 +08:00
lyc 54be3cad4f 隐藏教学工作台 2024-12-20 10:56:55 +08:00
“zouyf” debd5e1942 Merge branch 'main' into zouyf_dev 2024-12-20 10:27:19 +08:00
zouyf 90161e0396 Merge pull request '暂屏蔽-[校本题库, 智能推荐, AI设计作业]' (#157) from zouyf_tmp into main
Reviewed-on: #157
2024-12-20 10:27:05 +08:00
“zouyf” 3a6c7dfa47 暂屏蔽-[校本题库, 智能推荐, AI设计作业] 2024-12-20 10:25:30 +08:00