42f24041db
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
727299aac9
Merge pull request 'zouyf_dev' (#63) from zouyf_dev into main
27b0457eef
Merge pull request 'edit' (#62) from lyc-dev into main
34e74c5ec6
edit
208f5d496f
Merge branch 'main' into zouyf_dev
2cecbc14fd
Merge pull request 'yangws' (#418) from yangws into main
8d8ff06c5e
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into yangws
0a3ab2eff5
fix:固定学科;
21a4f4cfac
Merge pull request 'fix:实验室样式修改;' (#417) from yangws into main
16f696bd4f
fix:实验室样式修改;
b081000f11
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
01dc5dc643
Merge pull request 'zdg_dev' (#61) from zdg_dev into main
349bdbd181
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
8707b54420
pptList 功能二开
82091fbef5
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev
124b584e38
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
748a3c4b86
Merge pull request '增加根据用户id查询' (#60) from zouyf_dev into main
c4c1115abb
增加根据用户id查询
eefc4d75f8
Merge pull request 'zouyf_dev' (#59) from zouyf_dev into main
db99dbf0d8
Merge branch 'main' into zouyf_dev
dc36821366
Merge pull request 'fix:新增图标;' (#57) from yws_dev into main
2641845ce0
fix:新增图标;
e1a12ff0e0
个别文字说明修改
4fbd77c40c
Merge remote-tracking branch 'origin/main'
dfe1a23327
Merge pull request 'baigl' (#56) from baigl into main
dfe1a23327
Merge pull request 'baigl' (#56) from baigl into main
437bff2cdd
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
6a6d932852
作业管理
437bff2cdd
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
fbf906f390
Merge pull request 'lyc-dev' (#55) from lyc-dev into main
663ecb962c
model/index.vue 冲突 解决
2f99a00a47
模板-考试分析
b24c3f1899
Merge pull request 'baigl' (#54) from baigl into main
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
7d41653036
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
ad006bb218
开放mathtype
ebed58ea9e
优化个人中心选择学科
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:样式调整;
39a5e6b60c
Merge pull request 'baigl' (#52) from baigl into main
7d41653036
Merge branch 'zouyf_dev' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
ad006bb218
开放mathtype
ebed58ea9e
优化个人中心选择学科
fd5343c942
Merge branch 'main' into zouyf_dev
39a5e6b60c
Merge pull request 'baigl' (#52) from baigl into main
6ea3246428
Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into baigl
877c971415
习题上传: