e7c6ab9e8d
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
85d06f306a
fix:ppt活动添加;
656a58693f
Merge remote-tracking branch 'origin/main'
34cfcf5a6f
Merge pull request 'zouyf_dev' (#102) from zouyf_dev into main
ffd6d6fab9
Merge pull request 'yws_dev' (#99) from yws_dev into main
23e59531ea
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
9e021edc67
fix:添加活动;
5b1d921378
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
0aa09e9d9a
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
23e59531ea
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
9e021edc67
fix:添加活动;
238f08d9ac
Merge pull request 'zouyf_dev' (#98) from zouyf_dev into main
f936e726c0
Merge branch 'main' into zouyf_dev
8d03c927b9
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
edabc0336f
add:新增pptlist活动列表;
c22b360e0f
Merge pull request 'zdg_dev' (#80) from zdg_dev into main
3b851887ca
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
e6333e49f0
更新ppt
c338f34127
Merge pull request 'yws_dev' (#70) from yws_dev into main
5b49eef8e8
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
1060929532
fix:修改个人中心默认修改;
5b49eef8e8
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yws_dev
1060929532
fix:修改个人中心默认修改;
448c4d979f
Merge pull request 'baigl' (#69) from baigl into main
222f558807
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
ef5dfc8ed1
习题筛选修改
733855b95e
Merge pull request 'fix:个人中心修改学科问题;' (#68) from yws_dev into main
7a6f57a9b7
fix:个人中心修改学科问题;
7a6f57a9b7
fix:个人中心修改学科问题;
b0d3876e05
Merge pull request 'lyc-dev' (#67) from lyc-dev into main
eb197db4fd
框架设计-edit
5808798b95
模板修改
393587848f
模板修改
532e724351
Merge pull request 'fix:加个平均时长判断;' (#421) from yangws into main
ead9ebd6eb
fix:加个平均时长判断;
ead9ebd6eb
fix:加个平均时长判断;
a147c60d78
Merge pull request 'fix:推送分值丢失问题;' (#420) from yangws into main
a147c60d78
Merge pull request 'fix:推送分值丢失问题;' (#420) from yangws into main
a0477a18df
fix:推送分值丢失问题;