Commit Graph

867 Commits

Author SHA1 Message Date
zouyf e1c717eec4 Merge pull request 'zouyf_dev' (#221) from zouyf_dev into main
Reviewed-on: #221
2025-01-13 14:56:12 +08:00
“zouyf” 8185cc458d [作业设计] - 优化图片显示 2025-01-13 14:49:56 +08:00
lyc e6c2e264d2 Merge pull request 'edit' (#220) from lyc-dev into main 2025-01-13 13:51:54 +08:00
lyc 5708850be9 edit 2025-01-13 13:51:16 +08:00
朱浩 afa1fd2f8d BUG修复 2025-01-10 15:24:44 +08:00
lyc 5d7533e2ab Merge pull request 'edit 框架设计' (#219) from lyc-dev into main 2025-01-10 15:14:48 +08:00
lyc 250f73cce6 edit 框架设计 2025-01-10 15:14:24 +08:00
zhangxuelin 125d360c52 Merge pull request 'zxl' (#218) from zxl into main
Reviewed-on: #218
2025-01-10 15:07:42 +08:00
zhangxuelin dcf6d5b45d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 15:06:54 +08:00
zhangxuelin 07ab1b6a84 插入素材 2025-01-10 15:06:38 +08:00
lyc 4e85477a5a Merge pull request 'edit 框架设计' (#217) from lyc-dev into main 2025-01-10 14:57:51 +08:00
lyc d7c57896da edit 框架设计 2025-01-10 14:57:20 +08:00
朱浩 e40acda6ad BUG修复 2025-01-10 14:16:33 +08:00
zhangxuelin b9f0d76ee4 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 14:16:28 +08:00
zhangxuelin a5be937eb3 上传图片 2025-01-10 14:16:18 +08:00
朱浩 5b05b6a94b BUG修复 2025-01-10 14:09:39 +08:00
zhangxuelin de0a167cf5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 14:06:11 +08:00
zhangxuelin 616fb36c55 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-10 14:05:26 +08:00
朱浩 336fbb0680 BUG修复 2025-01-10 10:35:19 +08:00
zhangxuelin 4650c47f70 Merge pull request '语音npm包跟新' (#216) from zxl into main
Reviewed-on: #216
2025-01-09 17:04:50 +08:00
zhangxuelin f8f98b400c 语音npm包跟新 2025-01-09 17:04:21 +08:00
zhangxuelin 4c62c109a8 Merge pull request 'zxl' (#215) from zxl into main
Reviewed-on: #215
2025-01-09 16:55:32 +08:00
zhangxuelin a4b1a5bb30 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-09 16:54:09 +08:00
zhangxuelin cde8f13f8e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2025-01-09 16:54:00 +08:00
lyc 33f4ae42db Merge pull request 'edit 框架设计' (#214) from lyc-dev into main 2025-01-09 16:53:25 +08:00
lyc 96e71ff45e edit 框架设计 2025-01-09 16:49:43 +08:00
朱浩 38e17585f2 Merge remote-tracking branch 'origin/main' 2025-01-09 16:00:23 +08:00
朱浩 b85b95e817 BUG修复 2025-01-09 16:00:15 +08:00
zhangxuelin 6575f2e479 Merge pull request '语音合成' (#213) from zxl into main
Reviewed-on: #213
2025-01-09 15:50:39 +08:00
zhangxuelin aee58d2443 语音合成 2025-01-09 15:50:06 +08:00
zhangxuelin f9ab056a07 Merge pull request 'zxl' (#212) from zxl into main
Reviewed-on: #212
2025-01-09 15:47:02 +08:00
zhangxuelin f344163e6d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/main.js
2025-01-09 15:45:17 +08:00
zhangxuelin f47cd1213b 添加语音生成 2025-01-09 15:42:29 +08:00
lyc 33d7c8c96c Merge pull request 'lyc-dev' (#211) from lyc-dev into main 2025-01-09 15:27:19 +08:00
lyc 3e8f8529fa edit 框架设计 2025-01-09 15:26:54 +08:00
lyc 6d1cc7e21b Merge branch 'main' into lyc-dev 2025-01-09 15:17:34 +08:00
lyc 5179e6407d edit 框架设计 2025-01-09 15:16:34 +08:00
朱浩 0c3b017a28 打包管理 2025-01-09 15:14:58 +08:00
zhengdegang 525d98dc41 Merge pull request 'zdg_dev' (#210) from zdg_dev into main
Reviewed-on: #210
2025-01-08 16:54:05 +08:00
zdg b286dbcce2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2025-01-08 16:49:11 +08:00
zdg dbaf861bef 课堂点名 2025-01-08 16:48:31 +08:00
“zouyf” cdf8fd2733 Merge branch 'main' into zouyf_dev 2025-01-08 16:35:17 +08:00
“zouyf” 6629496569 test 2025-01-08 16:35:03 +08:00
yangws f4d62410fb Merge pull request 'fix:修改学科学段的方式;' (#209) from yws_dev into main
Reviewed-on: #209
2025-01-08 14:02:52 +08:00
小杨 01e7dfbc2b fix:修改学科学段的方式; 2025-01-08 14:02:23 +08:00
朱浩 946eb0d072 Merge remote-tracking branch 'origin/main' 2025-01-08 13:45:51 +08:00
朱浩 510f02a530 打包管理 2025-01-08 13:45:40 +08:00
yangws c2a3ffb0a0 Merge pull request 'fix:修改个人中心学科方式;' (#208) from yws_dev into main
Reviewed-on: #208
2025-01-07 17:20:06 +08:00
小杨 8106fb0c41 fix:修改个人中心学科方式; 2025-01-07 17:19:41 +08:00
lyc 284ae40519 Merge pull request 'lyc-dev' (#207) from lyc-dev into main 2025-01-07 16:57:54 +08:00