Commits · 3ff654186a1e1ca9ad6fbc50c3809d56ed631170 · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

02 Jul, 2021 6 commits
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · 3ff65418
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 02, 2021
  3ff65418 Browse Files
- fix:得分不少于漏选分 · 404016dd
  maolipeng committed Jul 02, 2021
  
  404016dd Browse Files
- fix:合并助学工具默认图并解决冲突 · f5d562e3
  wufan committed Jul 02, 2021
  
  f5d562e3 Browse Files
- feat:完成全局设置iconfontfontweight和助学工具替换默认图功能 · 6f9accee
  wufan committed Jul 02, 2021
  
  6f9accee Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · 36884f87
  maolipeng committed Jul 02, 2021
  
  36884f87 Browse Files
- fix:批量设置得分不低于半对得分 · 22be4c24
  maolipeng committed Jul 02, 2021
  
  22be4c24 Browse Files
01 Jul, 2021 34 commits
- 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
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · 7be0501e
  maolipeng committed Jul 01, 2021
  
  7be0501e Browse Files
- fix:////// · f946fc86
  maolipeng committed Jul 01, 2021
  
  f946fc86 Browse Files
- merge:合并master · 8968c2d0
  guomingpang committed Jul 01, 2021
  
  8968c2d0 Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · 41a79d71
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 01, 2021
  41a79d71 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 'feature/pangguoming/20210701/active_students_number' into dev · 5d32c483
  guomingpang committed Jul 01, 2021
  
  5d32c483 Browse Files
- Merge branch 'dev' of… · 83df8958
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 01, 2021
  83df8958 Browse Files
- style:学员周活跃样式修改 · 7acee561
  guomingpang committed Jul 01, 2021
  
  7acee561 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
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · fdb38eb4
  maolipeng committed Jul 01, 2021
  
  fdb38eb4 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
- Merge branch 'feature/pangguoming/20210701/active_students_number' into dev · 322d1de7
  guomingpang committed Jul 01, 2021
  
  322d1de7 Browse Files
- fix:首页文字错误，学员周活跃-本月新增，应修改成：学员周活跃-本周新增 · e9a52548
  guomingpang committed Jul 01, 2021
  
  e9a52548 Browse Files
- Merge branch 'feature/pangguoming/20210701/active_students_number' into dev · 79a4af6e
  guomingpang committed Jul 01, 2021
  
  79a4af6e Browse Files
- Merge branch 'dev' of… · e964ef40
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 01, 2021
  e964ef40 Browse Files
- fix:课程总数。统计线下课 · 24707cde
  guomingpang committed Jul 01, 2021
  
  24707cde Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · a0540032
  maolipeng committed Jul 01, 2021
  
  a0540032 Browse Files