656a58693f
Merge remote-tracking branch 'origin/main'
772b196b31
Merge remote-tracking branch 'origin/main'
757edb0f67
改名AIPPT
34cfcf5a6f
Merge pull request 'zouyf_dev' (#102) from zouyf_dev into main
10a7e73c64
Merge branch 'main' into zouyf_dev
91e9867b68
Merge pull request 'zxl' (#101) from zxl into main
80ac4a6e1c
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
1987783fda
添加作业弹窗
f035cf87ea
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
e56eb059be
替换上传图片 视频url为线上url
80ac4a6e1c
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
fa776d2a8c
Merge pull request 'baigl' (#100) from baigl into main
122487cf8b
ppts习题插入:个人题库 习题截图放到ppts里面转换
b7f11c5338
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
f035cf87ea
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
ffd6d6fab9
Merge pull request 'yws_dev' (#99) from yws_dev into main
23e59531ea
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
9e021edc67
fix:添加活动;
238f08d9ac
Merge pull request 'zouyf_dev' (#98) from zouyf_dev into main
97f55ca333
Merge pull request 'lyc-dev' (#93) from lyc-dev into main
cb5445f9a9
Merge branch 'main' into lyc-dev
560e6f0e70
插入素材-pptlist
4010411c9f
Merge pull request 'baigl' (#92) from baigl into main
da1c80406f
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
dcabb80757
Merge pull request 'zdg_dev' (#87) from zdg_dev into main
53f26d96d4
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
7d7b50fa3e
类型定义
eae2171c70
Merge pull request 'baigl' (#86) from baigl into main
5fe9359d64
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
f9b80dd455
Merge pull request 'zdg_dev' (#75) from zdg_dev into main
482cab5cd3
ppt 优化
0d68e6efa7
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
d432d97507
版本冲突
a9443035c2
ppt文件转入数据
748a3c4b86
Merge pull request '增加根据用户id查询' (#60) from zouyf_dev into main
c4c1115abb
增加根据用户id查询
eefc4d75f8
Merge pull request 'zouyf_dev' (#59) from zouyf_dev into main
db99dbf0d8
Merge branch 'main' into zouyf_dev
3b6878ece5
更新下划线格式化
fd0499cefa
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS
4baf9f0062
PPTist接入
c1ce87f640
Merge pull request 'fix:样式修改;' (#42) from yangws_ws into main
da83bcec5c
fix:样式修改;
5a92b6dedf
Merge pull request 'fix:切换第三方资源格式;' (#408) from yangws into main
09df401cf1
fix:切换第三方资源格式;
6b5164048c
Merge pull request 'zouyf_dev' (#407) from zouyf_dev into main
b973fd685c
优化滚动条
6e3efe7843
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS
432dbcc6fa
PPTist接入
cae55eac0b
Merge pull request 'zxl' (#41) from zxl into main
cae55eac0b
Merge pull request 'zxl' (#41) from zxl into main
2f3a2b7aae
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
98b1155fb7
添加人机验证
2f3a2b7aae
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
135cc4802f
Merge pull request 'baigl' (#40) from baigl into main
e322103089
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
640a8a6dd9
新增作业管理
7b65a19483
Merge pull request 'lyc-dev' (#39) from lyc-dev into main