Commit Graph

695 Commits

Author SHA1 Message Date
baigl f75ab621d2 Merge pull request 'baigl' (#124) from baigl into main
Reviewed-on: #124
2024-12-12 16:35:47 +08:00
白了个白 a711eb2745 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:35:04 +08:00
白了个白 363b284b7c 1 2024-12-12 16:34:47 +08:00
zdg 75b5884210 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 16:24:53 +08:00
zdg 03f160464c ppt上课 2024-12-12 16:24:47 +08:00
baigl dc4c0fd334 Merge pull request 'baigl' (#123) from baigl into main
Reviewed-on: #123
2024-12-12 16:24:36 +08:00
白了个白 fb3ffd5dda Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:23:51 +08:00
白了个白 5771533039 ppts: 插入试题 图片路径存储修改 2024-12-12 16:23:28 +08:00
zhangxuelin 75ea11e171 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-12 16:15:55 +08:00
zhangxuelin 851a39897b 修改作业弹窗 2024-12-12 16:15:16 +08:00
zhangxuelin 69bfc68b28 Merge pull request '作业弹窗' (#121) from zxl into main
Reviewed-on: #121
2024-12-12 16:12:53 +08:00
zhangxuelin 590b318757 作业弹窗 2024-12-12 16:12:32 +08:00
CYS 4421ee7fea Merge pull request '政治课标dataset_id修改' (#120) from cys_dev into main
Reviewed-on: #120
2024-12-12 16:05:55 +08:00
cys 19ef95447c 1 2024-12-12 16:04:43 +08:00
baigl 25b6da7f26 Merge pull request '教程分析:pdf页面展示修改' (#119) from baigl into main
Reviewed-on: #119
2024-12-12 15:27:00 +08:00
白了个白 892b4ee3b0 教程分析:pdf页面展示修改 2024-12-12 15:26:14 +08:00
zdg 354e0b44c9 生产环境地址 2024-12-12 12:27:01 +08:00
zdg 5e04a4c2c2 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 12:21:53 +08:00
zdg ca93eb72ac 更新消息 2024-12-12 12:21:47 +08:00
yangws 3d8f7c2a3a Merge pull request 'fix:修改pptlist添加活动的bug;' (#118) from yws_dev into main
Reviewed-on: #118
2024-12-12 11:27:19 +08:00
小杨 78cc5edd39 fix:修改pptlist添加活动的bug; 2024-12-12 11:26:26 +08:00
朱浩 9f4e232d6f Merge remote-tracking branch 'origin/main' 2024-12-12 11:20:12 +08:00
朱浩 afc9fe89d1 解决按钮层级问题 2024-12-12 11:19:38 +08:00
朱浩 894ed269ce 解决生产无法关闭PPTIST页面问题 2024-12-12 11:17:12 +08:00
zdg b15fa29ffa Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 11:02:22 +08:00
zhangxuelin 64d2dbcabb Merge pull request '点赞疑问' (#117) from zxl into main
Reviewed-on: #117
2024-12-12 10:58:09 +08:00
zhangxuelin f4cb3a8916 点赞疑问 2024-12-12 10:57:48 +08:00
yangws 69db6bd8b1 Merge pull request '清除debugger;' (#116) from yws_dev into main
Reviewed-on: #116
2024-12-12 10:53:38 +08:00
小杨 e522fc8ee5 清除debugger; 2024-12-12 10:53:15 +08:00
yangws 5b50404d3c Merge pull request 'fix:修改ppt添加活动的bug;' (#115) from yws_dev into main
Reviewed-on: #115
2024-12-12 10:52:40 +08:00
小杨 bbed835ffe fix:修改ppt添加活动的bug; 2024-12-12 10:52:10 +08:00
zdg 9ef4812acb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 10:31:00 +08:00
zhangxuelin d9bdd5424f Merge pull request '点赞和疑问' (#114) from zxl into main
Reviewed-on: #114
2024-12-12 10:29:16 +08:00
zhangxuelin 979621b515 点赞和疑问 2024-12-12 10:28:32 +08:00
zdg d313f901a3 去掉注释 2024-12-11 17:32:11 +08:00
zdg 8990ffdc58 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-11 17:17:01 +08:00
zdg 13b1a895a4 上课 socket 2024-12-11 17:16:55 +08:00
朱浩 9c7aeb1a27 Merge remote-tracking branch 'origin/main' 2024-12-11 17:11:22 +08:00
lyc 7545e68a62 Merge pull request 'edit' (#113) from lyc-dev into main 2024-12-11 17:04:37 +08:00
lyc dad772713f edit 2024-12-11 17:04:12 +08:00
朱浩 a9faeea3fd Merge remote-tracking branch 'origin/main' 2024-12-11 17:03:04 +08:00
朱浩 5493de7a61 版本升级 2024-12-11 17:02:44 +08:00
朱浩 02ab1ffa8e 霞客 2024-12-11 16:42:46 +08:00
朱浩 10e76add35 霞客 2024-12-11 16:35:52 +08:00
lyc c1325db9e7 Merge pull request 'edit 模板' (#112) from lyc-dev into main 2024-12-11 15:07:56 +08:00
lyc cbc12a3d43 edit 模板 2024-12-11 15:07:25 +08:00
baigl 44b341f7ac Merge pull request '作业管理:作业名称为空保存判断' (#111) from baigl into main
Reviewed-on: #111
2024-12-11 14:55:07 +08:00
白了个白 c8dd19382e 作业管理:作业名称为空保存判断 2024-12-11 14:51:07 +08:00
zhangxuelin f2faa882a8 Merge pull request 'zxl' (#110) from zxl into main
Reviewed-on: #110
2024-12-11 13:51:14 +08:00
zhangxuelin e4afb26e4e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-11 13:50:50 +08:00