zdg_dev #108

Merged
zhengdegang merged 5 commits from zdg_dev into main 2024-12-11 10:08:00 +08:00

5 Commits

Author SHA1 Message Date
zdg bb0aa82e82 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-11 10:06:30 +08:00
zdg 8ed13a3146 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
#	src/renderer/src/AixPPTist/src/api/index.ts
#	src/renderer/src/views/prepare/index.vue
2024-12-11 10:06:23 +08:00
zdg 9e5609fbdd ppt上课 2024-12-11 09:44:52 +08:00
zdg 4f68ae27b3 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-10 10:09:00 +08:00
zdg 38c041465e ppt上课 2024-12-10 10:08:53 +08:00