Commits · 22524f852984ee5ed19ec3159ee6d51f83a47743 · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

08 Jul, 2021 4 commits
- feat:解决合并代码后的冲突 · 22524f85
  zhangleyuan committed Jul 08, 2021
  
  22524f85 Browse Files
- fix:解决周优化培训计划关联树限制修复的合并冲突 · e47d0a7b
  yuananting committed Jul 08, 2021
  
  e47d0a7b Browse Files
- Merge branch 'feature/maolipeng/youhua' into gray · 282636bb
```
# Conflicts:
#	src/modules/home/Home.jsx
```
  maolipeng committed Jul 08, 2021
  282636bb Browse Files
- feat:处理重新上传 · c6f1064c
  zhangleyuan committed Jul 08, 2021
  
  c6f1064c Browse Files
06 Jul, 2021 4 commits
- fix:sbide · 310ca455
  maolipeng committed Jul 06, 2021
  
  310ca455 Browse Files
- featr:删除注释代码 · 68cdd6c5
  zhangleyuan committed Jul 06, 2021
  
  68cdd6c5 Browse Files
- fix:adadadasdasd · f50c7422
  maolipeng committed Jul 06, 2021
  
  f50c7422 Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · b6bee1f2
```
# Conflicts:
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jul 06, 2021
  b6bee1f2 Browse Files
04 Jul, 2021 23 commits
- fix:删除重复import · 4bb97c9a
  maolipeng committed Jul 04, 2021
  
  4bb97c9a Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into 'master' · f63c6492
```
Feature/maolipeng/20210610/zuhuyouhua

See merge request !61
```
  maolipeng committed Jul 04, 2021
  f63c6492 Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · 1be67de3
  maolipeng committed Jul 04, 2021
  
  1be67de3 Browse Files
- Merge branch 'feature/maolipeng/20210629/piliang' into 'master' · 0b6f18d9
```
Feature/maolipeng/20210629/piliang

See merge request !60
```
  maolipeng committed Jul 04, 2021
  0b6f18d9 Browse Files
- Merge branch 'master' into feature/maolipeng/20210629/piliang · d6f6029f
  maolipeng committed Jul 04, 2021
  
  d6f6029f Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · 69cfc14a
```
# Conflicts:
#	src/modules/home/Home.jsx
#	src/modules/home/Home.less
```
  maolipeng committed Jul 04, 2021
  69cfc14a Browse Files
- 'fix:二维码图片位置' · a160710c
  zhujian committed Jul 04, 2021
  
  a160710c Browse Files
- Merge branch 'feature/pangguoming/20210701/active_students_number' into 'master' · 92c3ba9e
```
Feature/pangguoming/20210701/active students number

See merge request !59
```
  wufan committed Jul 04, 2021
  92c3ba9e Browse Files
- feat:将下载的方法提取出来 · 2058baf0
  zhangleyuan committed Jul 04, 2021
  
  2058baf0 Browse Files
- fix:代码丢失..... · 2214f415
  maolipeng committed Jul 04, 2021
  
  2214f415 Browse Files
- feat:首页新增周活跃统计 · ed7d6c0f
  guomingpang committed Jul 04, 2021
  
  ed7d6c0f Browse Files
- Merge branch 'gray' of… · 2f55d493
```
Merge branch 'gray' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into gray
```
  guomingpang committed Jul 04, 2021
  2f55d493 Browse Files
- fix:sdasdadadasd · 7efa89ff
  maolipeng committed Jul 04, 2021
  
  7efa89ff Browse Files
- style:禁止换行 · b033bb3b
  guomingpang committed Jul 04, 2021
  
  b033bb3b 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/20210629/piliang' into gray · a2520479
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 04, 2021
  a2520479 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into gray · 70da6adc
```
# Conflicts:
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/modal/ManageCoursewareModal.jsx
#	src/modules/course-manage/video-course/AddVideoCourse.jsx
```
  maolipeng committed Jul 04, 2021
  70da6adc Browse Files
- Merge branch 'master' into feature/maolipeng/20210629/piliang · cda27593
```
# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
```
  maolipeng committed Jul 04, 2021
  cda27593 Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · 0eedc63e
```
# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/graphics-course/components/GraphicsCourseList.jsx
#	src/modules/root/Login.jsx
#	src/modules/root/Menu.less
#	src/modules/root/Menu.tsx
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx
#	src/modules/teach-tool/paper-manage/OperatePaper.less
```
  maolipeng committed Jul 04, 2021
  0eedc63e 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:处理图片裁剪 · 191c33c9
  zhangleyuan committed Jul 04, 2021
  
  191c33c9 Browse Files
02 Jul, 2021 9 commits
- 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
- fix:去除小数，，， · ed9cbf2f
  maolipeng committed Jul 02, 2021
  
  ed9cbf2f Browse Files
- fix:去除小数，，， · e65e34ab
  maolipeng committed Jul 02, 2021
  
  e65e34ab 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