c2a4f2c708
Merge remote-tracking branch 'origin/main'
eb18344b6b
Merge pull request 'yws_dev' (#143) from yws_dev into main
e080e39e1c
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
25f09cb4e0
fix:头像类型修改;
3b67c34ccb
Merge remote-tracking branch 'origin/main'
ed8051d0e0
Merge remote-tracking branch 'origin/main'
628055fb58
大模型页面补全
1698ce30dd
Merge pull request '更新ppt活动' (#140) from zdg_dev into main
a973d296fe
更新ppt活动
bf4b857eb7
Merge pull request 'zxl' (#139) from zxl into main
79839458f0
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
d018a28200
添加注册验证码倒计时
2214c5d805
Merge pull request 'ppt上课 拖动更新排序 动画播放等' (#138) from zdg_dev into main
9ad959dfb7
ppt上课 拖动更新排序 动画播放等
a421ca94bc
Merge pull request 'fix:修改监听活动的方式;' (#136) from yws_dev into main
6eda37c8c9
fix:修改监听活动的方式;
2a11173874
Merge pull request 'lyc-dev' (#135) from lyc-dev into main
88869e9a8a
Merge branch 'main' into lyc-dev
08db70a3f2
edit
15b9f38810
Merge pull request 'yws_dev' (#130) from yws_dev into main
a34883abbb
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
8f8016cb0b
fix:添加默认头像以及pptlist的bug;
e43573bae2
Merge pull request 'edit' (#129) from lyc-dev into main
83d885bcbe
查询模板增加user
b4864bc109
Merge pull request 'lyc-dev' (#128) from lyc-dev into main
a379176496
edti 插入素材
c2d5f2e99a
Merge pull request 'zdg_dev' (#127) from zdg_dev into main
eaa14b1666
Merge branch 'main' into lyc-dev
99c26145d8
edit
c3b975fee9
Merge pull request 'baigl' (#126) from baigl into main
ea2a8ebfda
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
308465adb4
ppts: 64转file 提取到utils image中
ea2a8ebfda
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
469116701b
Merge pull request 'fix:修改pptlist活动的bug;' (#125) from yws_dev into main
7861727e92
fix:修改pptlist活动的bug;
c5e71e6e7b
Merge pull request '修改作业弹窗' (#122) from zxl into main
f75ab621d2
Merge pull request 'baigl' (#124) from baigl into main
a711eb2745
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
a711eb2745
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
dc4c0fd334
Merge pull request 'baigl' (#123) from baigl into main
dc4c0fd334
Merge pull request 'baigl' (#123) from baigl into main
fb3ffd5dda
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
5771533039
ppts: 插入试题 图片路径存储修改
fb3ffd5dda
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
69bfc68b28
Merge pull request '作业弹窗' (#121) from zxl into main
590b318757
作业弹窗
4421ee7fea
Merge pull request '政治课标dataset_id修改' (#120) from cys_dev into main