zxl #101

Merged
zhangxuelin merged 4 commits from zxl into main 2024-12-10 10:41:10 +08:00

4 Commits

Author SHA1 Message Date
zhangxuelin 80ac4a6e1c Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl 2024-12-10 10:40:21 +08:00
zhangxuelin 1987783fda 添加作业弹窗 2024-12-10 10:40:00 +08:00
zhangxuelin f035cf87ea Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
2024-12-10 09:43:43 +08:00
zhangxuelin e56eb059be 替换上传图片 视频url为线上url 2024-12-10 09:41:59 +08:00