Commit Graph

318 Commits

Author SHA1 Message Date
白了个白 328e623db7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-04 14:36:53 +08:00
白了个白 8ad041e963 1 2024-12-04 14:34:25 +08:00
zhengdegang c22b360e0f Merge pull request 'zdg_dev' (#80) from zdg_dev into main
Reviewed-on: #80
2024-12-04 14:34:14 +08:00
zdg 3b851887ca Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-12-04 14:33:30 +08:00
zdg e6333e49f0 更新ppt 2024-12-04 14:33:08 +08:00
CYS cee81102da Merge pull request '文生图' (#79) from cys_dev into main
Reviewed-on: #79
2024-12-04 10:29:19 +08:00
cys 59bc2fba86 Merge branch 'cys_dev' 2024-12-04 10:27:45 +08:00
zouyf 051aa6bd56 Merge pull request 'zouyf_dev' (#78) from zouyf_dev into main
Reviewed-on: #78
2024-12-02 17:29:44 +08:00
“zouyf” 330a9acddb 避免多次点击 2024-12-02 17:25:10 +08:00
“zouyf” 90dff4d5c7 Merge branch 'main' into zouyf_dev 2024-12-02 16:36:12 +08:00
baigl e64311e8a4 Merge pull request 'baigl' (#77) from baigl into main
Reviewed-on: #77
2024-12-02 15:36:13 +08:00
白了个白 7c304650ad Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-02 15:35:13 +08:00
lyc 1a267e5696 Merge pull request 'lyc-dev' (#76) from lyc-dev into main 2024-12-02 14:25:30 +08:00
lyc cd6ca2e4e7 最大最小化icon 2024-12-02 14:24:02 +08:00
“zouyf” 99c90bf9a3 Merge branch 'main' into zouyf_dev 2024-12-02 10:44:51 +08:00
白了个白 40053c6c79 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-12-02 10:19:30 +08:00
zhengdegang f9b80dd455 Merge pull request 'zdg_dev' (#75) from zdg_dev into main
Reviewed-on: #75
2024-11-28 16:16:10 +08:00
zdg 482cab5cd3 ppt 优化 2024-11-28 16:15:25 +08:00
“zouyf” c3620a11ee 1 2024-11-28 14:17:32 +08:00
zdg 0d68e6efa7 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-28 09:33:48 +08:00
zdg d432d97507 版本冲突 2024-11-28 09:33:39 +08:00
zdg a9443035c2 ppt文件转入数据 2024-11-27 17:58:25 +08:00
lyc 7b4e54cb16 edit 2024-11-27 17:31:54 +08:00
白了个白 eb428eaddf Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 16:58:39 +08:00
“zouyf” e30e3fd42d Merge branch 'main' into zouyf_dev 2024-11-27 16:58:18 +08:00
“zouyf” 81f704b2a5 1 2024-11-27 15:48:22 +08:00
lyc 58e80d590e Merge pull request 'edit' (#74) from lyc-dev into main 2024-11-27 14:38:49 +08:00
lyc 8a1c5d7186 edit 2024-11-27 14:38:22 +08:00
zdg 7c3f3ea8fb Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 14:21:00 +08:00
zdg f2b1a097bb 更新ppt-排序 2024-11-27 14:20:52 +08:00
朱浩 a6e6f450c5 s生成PPT 2024-11-27 14:19:24 +08:00
白了个白 944dff1b00 1 2024-11-27 14:15:00 +08:00
zdg 64e7c27a44 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 14:09:40 +08:00
zdg c555de5fe5 修复pptx 2024-11-27 14:09:32 +08:00
zhengdegang a4f276908e Merge pull request 'zdg_dev' (#73) from zdg_dev into main
Reviewed-on: #73
2024-11-27 13:47:12 +08:00
zdg a10d3b078b Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev 2024-11-27 13:45:57 +08:00
zdg c1bba6e443 pptist 基础功能 2024-11-27 13:45:48 +08:00
lyc 231a7b6dce Merge pull request 'edit' (#72) from lyc-dev into main 2024-11-27 12:02:35 +08:00
lyc 310d9d3a2b edit 2024-11-27 12:02:14 +08:00
lyc fae380f9c6 Merge pull request 'edit' (#71) from lyc-dev into main 2024-11-27 11:21:39 +08:00
lyc a68fb21203 edit 2024-11-27 11:21:18 +08:00
朱浩 2c6ccd893b s生成PPT 2024-11-27 11:03:35 +08:00
朱浩 540e5f0179 Merge remote-tracking branch 'origin/main' 2024-11-27 10:59:44 +08:00
朱浩 8a8f90ce16 s生成PPT 2024-11-27 10:58:29 +08:00
朱浩 050f87a84a s生成PPT 2024-11-27 10:58:00 +08:00
yangws c338f34127 Merge pull request 'yws_dev' (#70) from yws_dev into main
Reviewed-on: #70
2024-11-27 10:52:14 +08:00
小杨 5b49eef8e8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev 2024-11-27 10:51:50 +08:00
小杨 1060929532 fix:修改个人中心默认修改; 2024-11-27 10:51:43 +08:00
baigl 448c4d979f Merge pull request 'baigl' (#69) from baigl into main
Reviewed-on: #69
2024-11-27 10:44:11 +08:00
白了个白 222f558807 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl 2024-11-27 10:41:03 +08:00