Commit Graph

1321 Commits

Author SHA1 Message Date
zdg 741e7336f3 上课 2024-09-14 16:39:31 +08:00
朱浩 a67f801356 Merge pull request 'zhuhao_dev' (#210) from zhuhao_dev into main
Reviewed-on: #210
2024-09-14 16:01:51 +08:00
朱浩 1c89217fbf Merge branch 'main' into zhuhao_dev 2024-09-14 16:01:08 +08:00
朱浩 3a20f453c6 APT上课 2024-09-14 16:00:45 +08:00
朱浩 dfa5c7d99b APT上课 2024-09-14 15:59:40 +08:00
lyc e144fbe36a Merge pull request 'lyc-dev' (#209) from lyc-dev into main 2024-09-14 15:13:05 +08:00
lyc b279d36c89 edit 2024-09-14 15:12:36 +08:00
lyc 8013b1c2cc edit 2024-09-14 14:59:35 +08:00
baigl 610aac6985 Merge pull request 'baigl' (#208) from baigl into main
Reviewed-on: #208
2024-09-14 14:22:36 +08:00
白了个白 6c85654608 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-14 14:22:02 +08:00
白了个白 a5b6cd3516 1 2024-09-14 14:18:13 +08:00
lyc 01718f573b Merge pull request '警告' (#207) from lyc-dev into main 2024-09-14 13:44:42 +08:00
lyc ec9c673b5a 警告 2024-09-14 13:44:35 +08:00
白了个白 578fc9feba 1 2024-09-14 10:23:45 +08:00
白了个白 f49cba5e36 作业管理:放开作业设计弹窗、作业布置的外部链接跳转;批阅界面需求变更调整; 2024-09-14 10:14:40 +08:00
lyc a92176174a Merge pull request '作业查询' (#206) from lyc-dev into main 2024-09-13 17:19:55 +08:00
lyc 8063783284 作业查询 2024-09-13 17:19:17 +08:00
lyc eadc6f1440 Merge pull request '工作台、资源库调整' (#205) from lyc-dev into main 2024-09-13 17:07:48 +08:00
lyc 8753951796 工作台、资源库调整 2024-09-13 17:03:30 +08:00
白了个白 490add5467 工作台右侧工作动态的作业, 新增可点击并弹框批改 2024-09-13 16:27:09 +08:00
白了个白 634ae460f3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-13 15:32:58 +08:00
白了个白 1cc7007852 作业分离后 接口传参修改 2024-09-13 14:02:05 +08:00
朱浩 502cf13168 Merge branch 'main' into zhuhao_dev 2024-09-13 09:53:55 +08:00
朱浩 a4fa5be295 文件上传修改 2024-09-13 09:30:36 +08:00
yangws e907a1c07a Merge pull request 'fix: 解决资源库报错的问题;' (#204) from yangws into main
Reviewed-on: #204
2024-09-12 16:53:15 +08:00
yangws 1afaed082a fix: 解决资源库报错的问题; 2024-09-12 16:52:47 +08:00
lyc 69362a6153 Merge pull request 'lyc-dev' (#203) from lyc-dev into main 2024-09-12 16:03:56 +08:00
lyc 1da3ca0ee0 Merge branch 'main' into lyc-dev 2024-09-12 16:03:42 +08:00
lyc d4a6f74cfc 首页调整 2024-09-12 16:03:21 +08:00
zouyf f57c67aab2 Merge pull request 'zouyf_dev' (#202) from zouyf_dev into main
Reviewed-on: #202
2024-09-12 15:58:59 +08:00
“zouyf” 63ad74c77f Merge branch 'main' into zouyf_dev 2024-09-12 15:58:28 +08:00
“zouyf” d171117f03 tmp 2024-09-12 15:58:12 +08:00
lyc 0426b85d3f Merge pull request '工作台' (#201) from lyc-dev into main 2024-09-12 15:42:55 +08:00
lyc 17b8ce1dda 工作台 2024-09-12 15:42:43 +08:00
zhangxuelin 0fa3c84f5e 修改注册bug 2024-09-12 11:09:51 +08:00
zhangxuelin 490536654a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-12 10:51:38 +08:00
zhangxuelin 2efb870a16 添加注册提示 2024-09-12 10:51:12 +08:00
yangws 5778a8955d Merge pull request 'fix: 提示教材没有时选择教材;' (#200) from yangws into main
Reviewed-on: #200
2024-09-12 09:48:40 +08:00
朱浩 e4e23e7508 Merge pull request '排序问题处理' (#199) from zhuhao_dev into main
Reviewed-on: #199
2024-09-12 09:48:14 +08:00
yangws 6a33ea8023 fix: 提示教材没有时选择教材; 2024-09-12 09:47:46 +08:00
朱浩 bc0579fa32 排序问题处理 2024-09-12 09:47:35 +08:00
yangws 3357cf8a78 Merge pull request 'fix: 样式修改,以及第三方资源名称不对应的情况;' (#198) from yangws into main
Reviewed-on: #198
2024-09-12 09:31:57 +08:00
yangws 3fdf500366 fix: 样式修改,以及第三方资源名称不对应的情况; 2024-09-12 09:30:44 +08:00
zhengdegang e985417675 Merge pull request 'zdg' (#197) from zdg into main
Reviewed-on: #197
2024-09-11 20:06:20 +08:00
zdg 1978d1bac1 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 20:05:30 +08:00
zdg b9014b950a 密码找回 2024-09-11 20:05:18 +08:00
lyc 03ecbb1d50 Merge pull request 'ai助手-拖动' (#196) from lyc-dev into main 2024-09-11 16:51:56 +08:00
lyc ec3b978185 ai助手-拖动 2024-09-11 16:50:47 +08:00
zdg 3632beebfa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-11 16:17:16 +08:00
zdg f0e87338fb 注册优化,修复 2024-09-11 16:17:05 +08:00