zhangxuelin

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-24 16:08:56 +08:00

ab9bad467a Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

89e0b2f97c Merge pull request 'edit 框架设计' (#176) from lyc-dev into main

406e581182 edit 框架设计

ea0e1c91cf Merge pull request 'lyc-dev' (#175) from lyc-dev into main

d4dce61555 Merge branch 'main' into lyc-dev

Compare 10 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-24 11:24:10 +08:00

a366d5d4d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

e0ec22c3ac 替换照片改为线上url

9c8872579f Merge pull request 'edit 框架设计' (#173) from lyc-dev into main

4f32927b49 edit 框架设计

e132f3927b Merge pull request 'zxl' (#172) from zxl into main

Compare 7 commits »

zhangxuelin merged pull request zhuhao/AIx_Smarttalk_WS#172

2024-12-24 10:07:34 +08:00

zxl

zhangxuelin pushed to main at zhuhao/AIx_Smarttalk_WS

2024-12-24 10:07:34 +08:00

e132f3927b Merge pull request 'zxl' (#172) from zxl into main

f732520d8d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

cf540d73df Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

83d3cd5df8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

64272467a2 ppist里面不显示导入

Compare 5 commits »

zhangxuelin created pull request zhuhao/AIx_Smarttalk_WS#172

2024-12-24 10:07:27 +08:00

zxl

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-24 09:51:37 +08:00

f732520d8d Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

01fbb9d05c Merge pull request 'lyc-dev' (#171) from lyc-dev into main

1334becb54 Merge branch 'main' into lyc-dev

c95508ed59 edit 模板

Compare 4 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-23 15:26:55 +08:00

cf540d73df Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

35bf246975 Merge pull request 'baigl' (#170) from baigl into main

e3c4706880 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl

c507331fb5 作业设计：作业类型 tag颜色样式修改

abd7be0698 Merge pull request '模板edit' (#169) from lyc-dev into main

Compare 6 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-23 09:41:26 +08:00

83d3cd5df8 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

b1407706a8 永川个性化打包

996b4006a2 永川个性化打包

4531533382 大模型顺序问题修改

a601a9f8dd Merge remote-tracking branch 'origin/main'

Compare 69 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-18 16:08:26 +08:00

64272467a2 ppist里面不显示导入

792ab3284f Merge pull request 'zdg_dev' (#149) from zdg_dev into main

38a50d18bf 注释

6fa0aa6e5f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev

b0fca4ad9b ppt上课-全屏演讲者

Compare 21 commits »

zhangxuelin pushed to main at zhuhao/AIx_Smarttalk_WS

2024-12-17 10:29:01 +08:00

436bdfe7c8 Merge pull request 'zxl' (#145) from zxl into main

2d0be935bf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

d6dfe966c0 pptist 比例修改

Compare 3 commits »

zhangxuelin merged pull request zhuhao/AIx_Smarttalk_WS#145

2024-12-17 10:29:00 +08:00

zxl

zhangxuelin created pull request zhuhao/AIx_Smarttalk_WS#145

2024-12-17 10:28:53 +08:00

zxl

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-17 10:26:59 +08:00

2d0be935bf Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

d6dfe966c0 pptist 比例修改

55efc7f3e1 Merge pull request 'fix:修复头像问题；' (#144) from yws_dev into main

122c5341e9 fix:修复头像问题；

c2a4f2c708 Merge remote-tracking branch 'origin/main'

Compare 12 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-16 15:08:48 +08:00

e58cb334e4 Merge pull request 'ppt -优化活动列表' (#141) from zdg_dev into main

c298e1c0a2 ppt -优化活动列表

ed8051d0e0 Merge remote-tracking branch 'origin/main'

628055fb58 大模型页面补全

1698ce30dd Merge pull request '更新ppt活动' (#140) from zdg_dev into main

Compare 6 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-16 10:43:11 +08:00

bf4b857eb7 Merge pull request 'zxl' (#139) from zxl into main

zhangxuelin pushed to main at zhuhao/AIx_Smarttalk_WS

2024-12-16 10:19:59 +08:00

bf4b857eb7 Merge pull request 'zxl' (#139) from zxl into main

79839458f0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

d018a28200 添加注册验证码倒计时

Compare 3 commits »

zhangxuelin merged pull request zhuhao/AIx_Smarttalk_WS#139

2024-12-16 10:19:57 +08:00

zxl

zhangxuelin created pull request zhuhao/AIx_Smarttalk_WS#139

2024-12-16 10:19:51 +08:00

zxl

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-16 10:19:20 +08:00

79839458f0 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zxl

d018a28200 添加注册验证码倒计时

2214c5d805 Merge pull request 'ppt上课拖动更新排序动画播放等' (#138) from zdg_dev into main

9ad959dfb7 ppt上课拖动更新排序动画播放等

0b9fce21f3 Merge pull request 'edit' (#137) from lyc-dev into main

Compare 12 commits »

zhangxuelin pushed to zxl at zhuhao/AIx_Smarttalk_WS

2024-12-13 14:26:25 +08:00

f9efb76282 Merge pull request 'fix:修改头像是取消头像消失的问题；' (#134) from yws_dev into main

ec3d728896 fix:修改头像是取消头像消失的问题；

cb0ab7f2e9 Merge pull request 'fix：ppt活动类型判断;' (#133) from yws_dev into main

43e9c9f44e fix：ppt活动类型判断;

809c639ce9 Merge pull request 'fix：头像问题；' (#132) from yws_dev into main

Compare 24 commits »