Commit Graph

697 Commits

Author SHA1 Message Date
baigl 39a5e6b60c Merge pull request 'baigl' (#52) from baigl into main
Reviewed-on: #52
2024-11-21 16:22:50 +08:00
白了个白 6ea3246428 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 16:22:10 +08:00
白了个白 877c971415 习题上传: 2024-11-21 16:15:14 +08:00
yangws 45f1a70d7a Merge pull request 'yws_dev' (#50) from yws_dev into main
Reviewed-on: #50
2024-11-21 16:04:12 +08:00
小杨 08f0b63741 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-11-21 16:03:11 +08:00
小杨 a711aef5f3 fix:作业管理样式修改; 2024-11-21 16:03:07 +08:00
“zouyf” ebed58ea9e 优化个人中心选择学科 2024-11-21 15:58:57 +08:00
朱浩 c8aa529621 Merge remote-tracking branch 'origin/main' 2024-11-21 15:43:56 +08:00
朱浩 60f2790b0c BUG修复 2024-11-21 15:43:28 +08:00
baigl 5be6659ab5 Merge pull request 'baigl' (#49) from baigl into main
Reviewed-on: #49
2024-11-21 15:31:52 +08:00
白了个白 009b29bc46 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 15:31:13 +08:00
白了个白 14bfef6903 个人题库:题目新增修改 2024-11-21 15:30:55 +08:00
白了个白 cbf2c29bb4 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 15:07:07 +08:00
白了个白 d25f2521a6 1 2024-11-21 15:06:44 +08:00
“zouyf” fd5343c942 Merge branch 'main' into zouyf_dev 2024-11-21 15:06:17 +08:00
“zouyf” 2511a6cc32 优化查找图标 2024-11-21 15:02:40 +08:00
小杨 ce523bdcd5 fix:合并主分支; 2024-11-21 14:38:19 +08:00
小杨 7e0718498f fix:修改样式; 2024-11-21 14:35:00 +08:00
朱浩 adbb4f0067 Merge remote-tracking branch 'origin/main' 2024-11-21 13:52:29 +08:00
朱浩 def9433647 PPTist接入 2024-11-21 13:52:17 +08:00
baigl a34226f29f Merge pull request 'baigl' (#48) from baigl into main
Reviewed-on: #48
2024-11-21 11:22:15 +08:00
白了个白 30b2b9b964 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-21 11:21:16 +08:00
白了个白 cadb8088a6 习题上传:习题内容识别迁移 2024-11-21 11:20:58 +08:00
lyc a9732218f4 Merge pull request 'lyc-dev' (#47) from lyc-dev into main 2024-11-21 10:58:19 +08:00
lyc 538e9190c7 Merge branch 'main' into lyc-dev 2024-11-21 10:57:31 +08:00
lyc 5567e94235 模板 2024-11-21 10:56:35 +08:00
baigl a118afbc64 Merge pull request 'baigl' (#46) from baigl into main
Reviewed-on: #46
2024-11-21 10:38:09 +08:00
白了个白 ab8fe885cb 1 2024-11-21 10:36:00 +08:00
白了个白 853fb871ef 1 2024-11-20 17:35:08 +08:00
白了个白 41db306f77 1 2024-11-20 17:31:14 +08:00
白了个白 0f9c2a7d53 Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-20 17:13:31 +08:00
白了个白 bf51f5084f 1 2024-11-20 17:13:07 +08:00
“zouyf” 96f25ab987 1 2024-11-20 16:51:51 +08:00
白了个白 2f2350531a 1 2024-11-20 16:20:45 +08:00
“zouyf” 0d0327f956 1 2024-11-20 16:20:09 +08:00
白了个白 5cbe56d1bf 作业管理 2024-11-20 15:30:18 +08:00
“zouyf” d5a8da438a Merge branch 'main' into zouyf_dev
# Conflicts:
#	package.json
2024-11-20 15:29:21 +08:00
lyc 45aa0a91a2 Merge pull request 'lyc-dev' (#45) from lyc-dev into main 2024-11-20 15:26:00 +08:00
lyc 0ccdbfe37a 冲突 2024-11-20 15:25:25 +08:00
lyc 1a0a2f9a67 模板 2024-11-20 15:23:42 +08:00
“zouyf” 51eea95a45 Merge branch 'main' into zouyf_dev
# Conflicts:
#	package.json
2024-11-20 15:10:50 +08:00
“zouyf” 3483076b66 1 2024-11-20 15:09:25 +08:00
白了个白 9534622067 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-20 14:33:08 +08:00
白了个白 761f19cf22 习题上传:待完善 2024-11-20 14:32:40 +08:00
“zouyf” 4bc5e3411f Merge branch 'baigl' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zouyf_dev 2024-11-20 09:55:42 +08:00
zdg 82091fbef5 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-19 17:26:11 +08:00
zdg 76a14264d7 屏蔽git原始信息 2024-11-19 17:25:57 +08:00
lyc c803ecd796 教学框架设计 2024-11-19 17:08:34 +08:00
yangws 5a09a7fecb Merge pull request 'yangws_ws' (#44) from yangws_ws into main
Reviewed-on: #44
2024-11-19 16:37:45 +08:00
小杨 639c07bccd fix:样式调整; 2024-11-19 16:37:17 +08:00