Commit Graph

675 Commits

Author SHA1 Message Date
小杨 a34883abbb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-12-13 11:18:48 +08:00
小杨 8f8016cb0b fix:添加默认头像以及pptlist的bug; 2024-12-13 11:18:33 +08:00
lyc a3079a87d0 edit 模板 2024-12-13 10:58:01 +08:00
lyc e43573bae2 Merge pull request 'edit' (#129) from lyc-dev into main 2024-12-13 10:34:04 +08:00
lyc 83d885bcbe 查询模板增加user 2024-12-13 10:33:35 +08:00
lyc b5669a97f1 模板查询增加user 2024-12-13 10:28:42 +08:00
“zouyf” cccf109499 Merge branch 'main' into zouyf_dev 2024-12-13 10:12:14 +08:00
“zouyf” 4a0e9b0b84 批改作业 2024-12-13 10:11:33 +08:00
lyc be2afadd43 edit 2024-12-13 10:10:36 +08:00
朱浩 a62dde1b93 Merge remote-tracking branch 'origin/main' 2024-12-13 10:06:23 +08:00
lyc b4864bc109 Merge pull request 'lyc-dev' (#128) from lyc-dev into main 2024-12-13 09:47:56 +08:00
lyc a379176496 edti 插入素材 2024-12-13 09:47:15 +08:00
zdg 6a9392d498 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 17:33:47 +08:00
zdg e8ecc27441 全屏 2024-12-12 17:33:39 +08:00
zhengdegang c2d5f2e99a Merge pull request 'zdg_dev' (#127) from zdg_dev into main
Reviewed-on: #127
2024-12-12 17:29:42 +08:00
lyc eaa14b1666 Merge branch 'main' into lyc-dev 2024-12-12 17:14:55 +08:00
lyc 99c26145d8 edit 2024-12-12 17:14:39 +08:00
zdg e7990dc175 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 17:02:31 +08:00
zdg 31de0da3c5 优化 2024-12-12 17:02:22 +08:00
朱浩 82548ce937 Merge remote-tracking branch 'origin/main' 2024-12-12 16:55:19 +08:00
朱浩 aa3be39721 研学相关权限问题 2024-12-12 16:55:08 +08:00
baigl c3b975fee9 Merge pull request 'baigl' (#126) from baigl into main
Reviewed-on: #126
2024-12-12 16:45:29 +08:00
白了个白 ea2a8ebfda Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-12 16:44:36 +08:00
白了个白 308465adb4 ppts: 64转file 提取到utils image中 2024-12-12 16:44:03 +08:00
yangws 469116701b Merge pull request 'fix:修改pptlist活动的bug;' (#125) from yws_dev into main
Reviewed-on: #125
2024-12-12 16:39:46 +08:00
小杨 7861727e92 fix:修改pptlist活动的bug; 2024-12-12 16:39:01 +08:00
zdg 80b66ffb28 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-12 16:38:44 +08:00
zhangxuelin c5e71e6e7b Merge pull request '修改作业弹窗' (#122) from zxl into main
Reviewed-on: #122
2024-12-12 16:38:33 +08:00
zhangxuelin c7ebc6de65 1 2024-12-12 16:37:51 +08:00
zhangxuelin b906a1e688 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-12 16:37:22 +08:00
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