5808798b95
模板修改
57fb6b9c75
Merge pull request 'fix:修改个人中心修改学科的时候不生效的问题;' (#66) from yws_dev into main
1882fd0dae
fix:修改个人中心修改学科的时候不生效的问题;
7f2cacffac
Merge pull request 'add:新增第三方资源筛选;' (#65) from yws_dev into main
e1caa441cb
add:新增第三方资源筛选;
27b0457eef
Merge pull request 'edit' (#62) from lyc-dev into main
34e74c5ec6
edit
fbf906f390
Merge pull request 'lyc-dev' (#55) from lyc-dev into main
663ecb962c
model/index.vue 冲突 解决
2f99a00a47
模板-考试分析
663ecb962c
model/index.vue 冲突 解决
b24c3f1899
Merge pull request 'baigl' (#54) from baigl into main
9efca5c7d8
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
c97470ccb0
Merge pull request 'fix:样式调整;' (#53) from yws_dev into main
c858186d9f
fix:样式调整;
a9732218f4
Merge pull request 'lyc-dev' (#47) from lyc-dev into main
538e9190c7
Merge branch 'main' into lyc-dev
5567e94235
模板
538e9190c7
Merge branch 'main' into lyc-dev
a118afbc64
Merge pull request 'baigl' (#46) from baigl into main
45aa0a91a2
Merge pull request 'lyc-dev' (#45) from lyc-dev into main
0ccdbfe37a
冲突
1a0a2f9a67
模板
c803ecd796
教学框架设计
19283456d4
Merge branch 'main' into lyc-dev
0ccdbfe37a
冲突
5a09a7fecb
Merge pull request 'yangws_ws' (#44) from yangws_ws into main
639c07bccd
fix:样式调整;
1f6427ff21
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into yangws_ws
d2c54e83c5
Merge pull request '优化ppt相关代码' (#43) from zdg_dev into main