Commit Graph

458 Commits

Author SHA1 Message Date
朱浩 87dcd9d5c3 Merge remote-tracking branch 'origin/main' 2024-12-05 15:47:38 +08:00
zouyf 1f96b9b09e Merge pull request 'zouyf_dev' (#90) from zouyf_dev into main
Reviewed-on: #90
2024-12-05 14:55:32 +08:00
小杨 0e18d74bb9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-05 14:47:27 +08:00
小杨 399c4b5461 add:添加活动页面; 2024-12-05 14:47:23 +08:00
“zouyf” 35c088c25a Merge branch 'main' into zouyf_dev 2024-12-05 14:37:13 +08:00
“zouyf” 028eb0f752 [考试分析] - 增加分页及优化题型获取 2024-12-05 14:36:50 +08:00
zhengdegang 9a68661fb0 Merge pull request 'zdg_dev' (#89) from zdg_dev into main
Reviewed-on: #89
2024-12-05 14:22:13 +08:00
zdg b28abdff50 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-05 14:21:43 +08:00
zdg b428260703 类型异常 2024-12-05 14:21:36 +08:00
lyc b5f824ceea Merge pull request 'edit' (#88) from lyc-dev into main 2024-12-05 10:36:59 +08:00
lyc d3b3e3bcb5 edit 2024-12-05 10:36:34 +08:00
zhengdegang dcabb80757 Merge pull request 'zdg_dev' (#87) from zdg_dev into main
Reviewed-on: #87
2024-12-05 09:47:15 +08:00
zdg 53f26d96d4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-05 09:44:51 +08:00
zdg 7d7b50fa3e 类型定义 2024-12-05 09:44:45 +08:00
baigl eae2171c70 Merge pull request 'baigl' (#86) from baigl into main
Reviewed-on: #86
2024-12-04 17:31:51 +08:00
白了个白 5fe9359d64 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 17:30:30 +08:00
白了个白 be9d33fcd3 pptist: canvasTool 里面 新增插入试题 2024-12-04 17:30:01 +08:00
lyc 09e3264ee7 Merge pull request 'edit' (#85) from lyc-dev into main 2024-12-04 17:16:34 +08:00
lyc 7845d9bb1a edit 2024-12-04 17:15:20 +08:00
zhengdegang 2fb6828154 Merge pull request 'zdg_dev' (#84) from zdg_dev into main
Reviewed-on: #84
2024-12-04 17:09:39 +08:00
zdg 03d1a683be Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-04 17:08:57 +08:00
zdg d542064ee3 ppt生成课堂备课 2024-12-04 17:08:51 +08:00
朱浩 9803c09c43 s生成PPT 2024-12-04 17:04:20 +08:00
zhengdegang 57fdba4578 Merge pull request 'ppt生产' (#83) from zdg_dev into main
Reviewed-on: #83
2024-12-04 16:42:25 +08:00
zdg 0e5d84fcd2 ppt生产 2024-12-04 16:41:38 +08:00
朱浩 7811bbfe3e s生成PPT 2024-12-04 16:28:52 +08:00
zhengdegang 7ddf71c044 Merge pull request 'zdg_dev' (#82) from zdg_dev into main
Reviewed-on: #82
2024-12-04 15:46:59 +08:00
zdg 91ceb712bf 异常修复 2024-12-04 15:45:45 +08:00
zdg a192640899 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-04 15:42:38 +08:00
zdg 08a16929f7 还原本地测试代码 2024-12-04 15:32:56 +08:00
lyc 42e8149443 Merge pull request 'lyc-dev' (#81) from lyc-dev into main 2024-12-04 15:14:22 +08:00
lyc 8b429a4174 edit 2024-12-04 15:13:53 +08:00
白了个白 23795f2419 Merge branch 'yws_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 15:09:05 +08:00
白了个白 ea204de407 1 2024-12-04 15:05:48 +08:00
白了个白 a31b8d7376 pptist:canvastool 新增 插入习题按钮 2024-12-04 14:58:47 +08:00
小杨 8d03c927b9 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-04 14:58:02 +08:00
小杨 edabc0336f add:新增pptlist活动列表; 2024-12-04 14:57:56 +08:00
白了个白 df474db4a5 1 2024-12-04 14:38:28 +08:00
白了个白 328e623db7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 14:36:53 +08:00
白了个白 8ad041e963 1 2024-12-04 14:34:25 +08:00
zhengdegang c22b360e0f Merge pull request 'zdg_dev' (#80) from zdg_dev into main
Reviewed-on: #80
2024-12-04 14:34:14 +08:00
zdg 3b851887ca Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-04 14:33:30 +08:00
zdg e6333e49f0 更新ppt 2024-12-04 14:33:08 +08:00
CYS cee81102da Merge pull request '文生图' (#79) from cys_dev into main
Reviewed-on: #79
2024-12-04 10:29:19 +08:00
cys 59bc2fba86 Merge branch 'cys_dev' 2024-12-04 10:27:45 +08:00
lyc 3ad4391e10 edit 模板 2024-12-03 10:11:51 +08:00
“zouyf” 7b59d78ce3 1 2024-12-02 17:30:24 +08:00
zouyf 051aa6bd56 Merge pull request 'zouyf_dev' (#78) from zouyf_dev into main
Reviewed-on: #78
2024-12-02 17:29:44 +08:00
“zouyf” 330a9acddb 避免多次点击 2024-12-02 17:25:10 +08:00
“zouyf” 90dff4d5c7 Merge branch 'main' into zouyf_dev 2024-12-02 16:36:12 +08:00