Commits · f530ebcfb8608ac760af6a2c36ef472ef2f1f279 · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

02 Jul, 2021 9 commits
- merge:merge master · f530ebcf
  guomingpang committed Jul 02, 2021
  
  f530ebcf Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · ce7a5a1e
  guomingpang committed Jul 02, 2021
  
  ce7a5a1e Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 1cf7cde7
  maolipeng committed Jul 02, 2021
  
  1cf7cde7 Browse Files
- fix:得分不少于漏选分 · 404016dd
  maolipeng committed Jul 02, 2021
  
  404016dd Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · 64f4b1f6
  guomingpang committed Jul 02, 2021
  
  64f4b1f6 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 4d000446
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
#	src/modules/teach-tool/paper-manage/OperatePaper.less
```
  maolipeng committed Jul 02, 2021
  4d000446 Browse Files
- fix:样式修改。。。。。 · cf5ce3a5
  maolipeng committed Jul 02, 2021
  
  cf5ce3a5 Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 7c6aec21
  maolipeng committed Jul 02, 2021
  
  7c6aec21 Browse Files
- fix:批量设置得分不低于半对得分 · 22be4c24
  maolipeng committed Jul 02, 2021
  
  22be4c24 Browse Files
01 Jul, 2021 31 commits
- Merge branch 'feature/maolipeng/20210629/piliang' into rc · 2eb30830
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 01, 2021
  2eb30830 Browse Files
- Merge branch 'refactor/yuanating/20210625/collage-init' into 'master' · 7638b279
```
Refactor/yuanating/20210625/collage init

See merge request !58
```
  wufan committed Jul 01, 2021
  7638b279 Browse Files
- Merge branch 'master' into refactor/yuanating/20210625/collage-init · 15ec8efb
  yuananting committed Jul 01, 2021
  
  15ec8efb Browse Files
- Merge branch 'hotfix/pangguoming/20210629/modify_course_manage_default_img' into 'master' · 973e9412
```
Hotfix/pangguoming/20210629/modify course manage default img

See merge request !57
```
  wufan committed Jul 01, 2021
  973e9412 Browse Files
- fix:修改直播课分享海报封面取值 · 4e806805
  yuananting committed Jul 01, 2021
  
  4e806805 Browse Files
- fix:////// · f946fc86
  maolipeng committed Jul 01, 2021
  
  f946fc86 Browse Files
- merge:合并master · 8968c2d0
  guomingpang committed Jul 01, 2021
  
  8968c2d0 Browse Files
- fix:........ · 48c8ebd6
  maolipeng committed Jul 01, 2021
  
  48c8ebd6 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · b23fca45
  guomingpang committed Jul 01, 2021
  
  b23fca45 Browse Files
- Merge branch 'refactor/yuanating/20210625/collage-init' into 'master' · 2c1b9ce7
```
Refactor/yuanating/20210625/collage init

See merge request !56
```
  wufan committed Jul 01, 2021
  2c1b9ce7 Browse Files
- fix:第二张表讲师字段添加是否返回判断 · f03a0f52
  yuananting committed Jul 01, 2021
  
  f03a0f52 Browse Files
- fix:fix:XMQXY-472 XMQXY-473 · 59c9ed09
  maolipeng committed Jul 01, 2021
  
  59c9ed09 Browse Files
- fix:修改教师名称字段是否返回的判断方法（?. => &&） · acdd4781
  yuananting committed Jul 01, 2021
  
  acdd4781 Browse Files
- docs:添加初始化学院时直播课列表创建时间展示注释 · 70471ef1
  yuananting committed Jul 01, 2021
  
  70471ef1 Browse Files
- Merge branch 'master' into refactor/yuanating/20210625/collage-init · 23472b1f
  yuananting committed Jul 01, 2021
  
  23472b1f Browse Files
- Merge branch 'feature/zhangleyuan/20210619/yongzong-optimize' into 'master' · d7bb18a9
```
Feature/zhangleyuan/20210619/yongzong optimize

See merge request !55
```
  wufan committed Jul 01, 2021
  d7bb18a9 Browse Files
- feat:删除注释 · 84d2d7d9
  zhangleyuan committed Jul 01, 2021
  
  84d2d7d9 Browse Files
- feat:删除注释 · 755e7b1e
  zhangleyuan committed Jul 01, 2021
  
  755e7b1e Browse Files
- Merge branch 'master' into feature/zhangleyuan/20210619/yongzong-optimize · 4de4930c
  zhangleyuan committed Jul 01, 2021
  
  4de4930c Browse Files
- feat:删除注释 · dbbb5ea8
  zhangleyuan committed Jul 01, 2021
  
  dbbb5ea8 Browse Files
- Merge branch 'feature/yuananting/20210624/replace_empty_picture' into 'master' · c380d5ba
```
Feature/yuananting/20210624/replace empty picture

See merge request !54
```
  wufan committed Jul 01, 2021
  c380d5ba Browse Files
- Merge branch… · f07295cb
```
Merge branch 'feature/zhangleyuan/20210628/feature/zhangleyuan/20210628/edit-login-page' into feature/zhangleyuan/20210619/yongzong-optimize
```
  zhangleyuan committed Jul 01, 2021
  f07295cb Browse Files
- Merge branch 'master' into feature/yuananting/20210624/replace_empty_picture · 33078815
  yuananting committed Jul 01, 2021
  
  33078815 Browse Files
- fix:XMQXY-471 · b7bb227f
  maolipeng committed Jul 01, 2021
  
  b7bb227f Browse Files
- fix:XMQXY-470 · f48e763e
  maolipeng committed Jul 01, 2021
  
  f48e763e Browse Files
- fix:解决合并试卷详情接口参数新增的功能冲突 · 9744c6f2
  yuananting committed Jul 01, 2021
  
  9744c6f2 Browse Files
- fix:统计值。。。。。 · 6499f580
  maolipeng committed Jul 01, 2021
  
  6499f580 Browse Files
- fix:增加提示。。。。 · 41693930
  maolipeng committed Jul 01, 2021
  
  41693930 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 8adf6055
  maolipeng committed Jul 01, 2021
  
  8adf6055 Browse Files
- feat:区分复制试卷和编辑试卷调用的详情接口 · 4603352f
  yuananting committed Jul 01, 2021
  
  4603352f Browse Files
- fix:到期提醒时间格式修改 · 6ae29f73
  maolipeng committed Jul 01, 2021
  
  6ae29f73 Browse Files