zdg_dev #230

Merged
zhengdegang merged 2 commits from zdg_dev into main 2025-01-21 12:35:34 +08:00

2 Commits

Author SHA1 Message Date
zdg 95fcd2445e Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
# Conflicts:
#	src/renderer/src/AixPPTist/src/hooks/useImport.ts
#	src/renderer/src/views/model/index.vue
2025-01-21 12:32:48 +08:00
zdg 4af2b5fc3a 优化pptx识别
母版加载等
2025-01-21 12:24:24 +08:00