Commits · 964245b45a3cb78d96879a6bc149b1ebc075152b · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

04 Jul, 2021 9 commits
- Merge branch 'feature/pangguoming/20210701/active_students_number' into dev · 964245b4
  guomingpang committed Jul 04, 2021
  
  964245b4 Browse Files
- Merge branch 'dev' of… · 57f64f2f
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 04, 2021
  57f64f2f Browse Files
- fix:课程总数本月新增 · 85ce4d41
  guomingpang committed Jul 04, 2021
  
  85ce4d41 Browse Files
- style:周活跃样式修改 · fc362d7d
  guomingpang committed Jul 04, 2021
  
  fc362d7d Browse Files
- Merge branch 'feature/maolipeng/youhua' into dev · 5bc81318
```
# Conflicts:
#	yarn.lock
```
  maolipeng committed Jul 04, 2021
  5bc81318 Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · 35a0915a
```
# Conflicts:
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jul 04, 2021
  35a0915a Browse Files
- fix:每周优化7月第二次优化 · d1f3f371
  maolipeng committed Jul 04, 2021
  
  d1f3f371 Browse Files
- feat:解决合并代码后的冲突 · ef2d2334
  zhangleyuan committed Jul 04, 2021
  
  ef2d2334 Browse Files
- feat:处理图片裁剪 · 191c33c9
  zhangleyuan committed Jul 04, 2021
  
  191c33c9 Browse Files
02 Jul, 2021 18 commits
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev · f72b201d
```
# Conflicts:
#	src/modules/root/Menu.less
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jul 02, 2021
  f72b201d Browse Files
- fix:........ · 466cbc53
  maolipeng committed Jul 02, 2021
  
  466cbc53 Browse Files
- fix:修复中心首页初始化课程总数闪现NaN的问题 · a2627059
  guomingpang committed Jul 02, 2021
  
  a2627059 Browse Files
- feat:处理图片裁剪 · 47bf5707
  zhangleyuan committed Jul 02, 2021
  
  47bf5707 Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · 1f50c7ed
  maolipeng committed Jul 02, 2021
  
  1f50c7ed Browse Files
- fix:去除小数，，， · ed9cbf2f
  maolipeng committed Jul 02, 2021
  
  ed9cbf2f Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into dev · f7ba408c
  maolipeng committed Jul 02, 2021
  
  f7ba408c Browse Files
- fix:去除小数，，， · e65e34ab
  maolipeng committed Jul 02, 2021
  
  e65e34ab Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into dev · b80b9152
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
#	src/modules/teach-tool/paper-manage/OperatePaper.less
```
  maolipeng committed Jul 02, 2021
  b80b9152 Browse Files
- 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
- Merge branch 'master' into feature/pangguoming/20210701/active_students_number · bfaec9cc
  guomingpang committed Jul 02, 2021
  
  bfaec9cc 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
- fix:样式修改。。。。。 · cf5ce3a5
  maolipeng committed Jul 02, 2021
  
  cf5ce3a5 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 13 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