 lyc
|
0b9fce21f3
|
Merge pull request 'edit' (#137) from lyc-dev into main
|
2024-12-16 10:06:40 +08:00 |
|
lyc
|
37d0592dcc
|
edit
|
2024-12-16 10:06:14 +08:00 |
 yangws
|
a421ca94bc
|
Merge pull request 'fix：修改监听活动的方式；' (#136) from yws_dev into main
Reviewed-on: #136
|
2024-12-16 09:56:18 +08:00 |
小杨
|
6eda37c8c9
|
fix：修改监听活动的方式；
|
2024-12-16 09:55:48 +08:00 |
|
lyc
|
2a11173874
|
Merge pull request 'lyc-dev' (#135) from lyc-dev into main
|
2024-12-16 09:50:59 +08:00 |
|
lyc
|
88869e9a8a
|
Merge branch 'main' into lyc-dev
|
2024-12-16 09:50:30 +08:00 |
|
lyc
|
08db70a3f2
|
edit
|
2024-12-16 09:50:17 +08:00 |
|
yangws
|
f9efb76282
|
Merge pull request 'fix:修改头像是取消头像消失的问题；' (#134) from yws_dev into main
Reviewed-on: #134
|
2024-12-13 14:01:33 +08:00 |
|
小杨
|
ec3d728896
|
fix:修改头像是取消头像消失的问题；
|
2024-12-13 14:01:13 +08:00 |
|
yangws
|
cb0ab7f2e9
|
Merge pull request 'fix：ppt活动类型判断;' (#133) from yws_dev into main
Reviewed-on: #133
|
2024-12-13 13:48:19 +08:00 |
|
小杨
|
43e9c9f44e
|
fix：ppt活动类型判断;
|
2024-12-13 13:47:56 +08:00 |
|
yangws
|
809c639ce9
|
Merge pull request 'fix：头像问题；' (#132) from yws_dev into main
Reviewed-on: #132
|
2024-12-13 13:46:49 +08:00 |
|
小杨
|
243561dfd8
|
fix：头像问题；
|
2024-12-13 13:45:06 +08:00 |
 zhengdegang
|
e5bc693f66
|
Merge pull request 'zdg_dev' (#131) from zdg_dev into main
Reviewed-on: #131
|
2024-12-13 13:18:09 +08:00 |
zdg
|
29888b0674
|
ppt播放 已经翻页异常情况
|
2024-12-13 13:17:18 +08:00 |
|
zdg
|
645f9ab120
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-13 13:16:31 +08:00 |
 朱浩
|
74767b44df
|
Merge remote-tracking branch 'origin/main'
|
2024-12-13 13:01:34 +08:00 |
|
朱浩
|
ef4ec36bbe
|
大模型页面补全
|
2024-12-13 13:00:02 +08:00 |
|
zdg
|
c4a15e9c53
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-13 12:46:51 +08:00 |
|
yangws
|
15b9f38810
|
Merge pull request 'yws_dev' (#130) from yws_dev into main
Reviewed-on: #130
|
2024-12-13 11:19:23 +08:00 |
|
小杨
|
a34883abbb
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
|
2024-12-13 11:18:48 +08:00 |
|
小杨
|
8f8016cb0b
|
fix：添加默认头像以及pptlist的bug；
|
2024-12-13 11:18:33 +08:00 |
|
lyc
|
a3079a87d0
|
edit 模板
|
2024-12-13 10:58:01 +08:00 |
|
lyc
|
e43573bae2
|
Merge pull request 'edit' (#129) from lyc-dev into main
|
2024-12-13 10:34:04 +08:00 |
|
lyc
|
83d885bcbe
|
查询模板增加user
|
2024-12-13 10:33:35 +08:00 |
|
lyc
|
b5669a97f1
|
模板查询增加user
|
2024-12-13 10:28:42 +08:00 |
|
lyc
|
be2afadd43
|
edit
|
2024-12-13 10:10:36 +08:00 |
|
朱浩
|
a62dde1b93
|
Merge remote-tracking branch 'origin/main'
|
2024-12-13 10:06:23 +08:00 |
|
lyc
|
b4864bc109
|
Merge pull request 'lyc-dev' (#128) from lyc-dev into main
|
2024-12-13 09:47:56 +08:00 |
|
lyc
|
a379176496
|
edti 插入素材
|
2024-12-13 09:47:15 +08:00 |
|
zdg
|
6a9392d498
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-12 17:33:47 +08:00 |
|
zdg
|
e8ecc27441
|
全屏
|
2024-12-12 17:33:39 +08:00 |
|
zhengdegang
|
c2d5f2e99a
|
Merge pull request 'zdg_dev' (#127) from zdg_dev into main
Reviewed-on: #127
|
2024-12-12 17:29:42 +08:00 |
|
lyc
|
eaa14b1666
|
Merge branch 'main' into lyc-dev
|
2024-12-12 17:14:55 +08:00 |
|
lyc
|
99c26145d8
|
edit
|
2024-12-12 17:14:39 +08:00 |
|
zdg
|
e7990dc175
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-12 17:02:31 +08:00 |
|
zdg
|
31de0da3c5
|
优化
|
2024-12-12 17:02:22 +08:00 |
|
朱浩
|
82548ce937
|
Merge remote-tracking branch 'origin/main'
|
2024-12-12 16:55:19 +08:00 |
|
朱浩
|
aa3be39721
|
研学相关权限问题
|
2024-12-12 16:55:08 +08:00 |
 baigl
|
c3b975fee9
|
Merge pull request 'baigl' (#126) from baigl into main
Reviewed-on: #126
|
2024-12-12 16:45:29 +08:00 |
白了个白
|
ea2a8ebfda
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-12 16:44:36 +08:00 |
|
白了个白
|
308465adb4
|
ppts： 64转file 提取到utils image中
|
2024-12-12 16:44:03 +08:00 |
|
yangws
|
469116701b
|
Merge pull request 'fix：修改pptlist活动的bug；' (#125) from yws_dev into main
Reviewed-on: #125
|
2024-12-12 16:39:46 +08:00 |
|
小杨
|
7861727e92
|
fix：修改pptlist活动的bug；
|
2024-12-12 16:39:01 +08:00 |
|
zdg
|
80b66ffb28
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
|
2024-12-12 16:38:44 +08:00 |
 zhangxuelin
|
c5e71e6e7b
|
Merge pull request '修改作业弹窗' (#122) from zxl into main
Reviewed-on: #122
|
2024-12-12 16:38:33 +08:00 |
|
zhangxuelin
|
c7ebc6de65
|
1
|
2024-12-12 16:37:51 +08:00 |
|
zhangxuelin
|
b906a1e688
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl
|
2024-12-12 16:37:22 +08:00 |
|
baigl
|
f75ab621d2
|
Merge pull request 'baigl' (#124) from baigl into main
Reviewed-on: #124
|
2024-12-12 16:35:47 +08:00 |
|
白了个白
|
a711eb2745
|
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
|
2024-12-12 16:35:04 +08:00 |