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

08 Jul, 2021 16 commits
- Merge branch 'feature/zhangleyuan/20210629/image-crop' into 'master' · c18a3e02
```
Feature/zhangleyuan/20210629/image crop

See merge request !64
```
  wufan committed Jul 08, 2021
  c18a3e02 Browse Files
- feat:删除注释 · b41087ac
  zhangleyuan committed Jul 08, 2021
  
  b41087ac Browse Files
- feat:删除注释代码 · 5d293f90
  zhangleyuan committed Jul 08, 2021
  
  5d293f90 Browse Files
- feat:解决合并代码后的冲突 · d719be39
  zhangleyuan committed Jul 08, 2021
  
  d719be39 Browse Files
- Merge branch 'feature/yuananting/20210705/select-course-limit' into 'master' · 377cc37b
```
Feature/yuananting/20210705/select course limit

See merge request !63
```
  wufan committed Jul 08, 2021
  377cc37b Browse Files
- Merge branch 'master' into feature/yuananting/20210705/select-course-limit · 961679f4
  yuananting committed Jul 08, 2021
  
  961679f4 Browse Files
- Merge branch 'feature/pangguoming/202010704/style_update' into 'master' · 62b372e7
```
Feature/pangguoming/202010704/style update

See merge request !62
```
  wufan committed Jul 08, 2021
  62b372e7 Browse Files
- Merge branch 'master' into feature/pangguoming/202010704/style_update · 3ef39fa3
  guomingpang committed Jul 08, 2021
  
  3ef39fa3 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · eda60cb7
  guomingpang committed Jul 08, 2021
  
  eda60cb7 Browse Files
- style:培训计划表格样式优化 · d369e7bf
  guomingpang committed Jul 08, 2021
  
  d369e7bf Browse Files
- style:培训计划表格样式优化 · b3e629a1
  guomingpang committed Jul 08, 2021
  
  b3e629a1 Browse Files
- feat:处理重新上传 · c6f1064c
  zhangleyuan committed Jul 08, 2021
  
  c6f1064c Browse Files
- style:培训计划表格样式优化 · 2738cc37
  guomingpang committed Jul 08, 2021
  
  2738cc37 Browse Files
- style:培训计划表格样式优化 · 0b40c523
  guomingpang committed Jul 08, 2021
  
  0b40c523 Browse Files
- style:培训计划表格样式优化 · 489c11c3
  guomingpang committed Jul 08, 2021
  
  489c11c3 Browse Files
- style:培训计划表格样式优化 · 58a0db3f
  guomingpang committed Jul 08, 2021
  
  58a0db3f Browse Files
07 Jul, 2021 1 commit
- style:直播课表格优化 · 0ee04f32
  guomingpang committed Jul 07, 2021
  
  0ee04f32 Browse Files
06 Jul, 2021 12 commits
- style:头部按钮位置调整 · 9ae443c4
  yuananting committed Jul 06, 2021
  
  9ae443c4 Browse Files
- docs:去掉LiveCourseList.jsx文件中多余的代码Type · 890189f5
  guomingpang committed Jul 06, 2021
  
  890189f5 Browse Files
- docs:修复liveliveCourseList eslint警告 · 4b287ee4
  guomingpang committed Jul 06, 2021
  
  4b287ee4 Browse Files
- docs:删除无用的appid · 1cdc2bca
  guomingpang committed Jul 06, 2021
  
  1cdc2bca Browse Files
- featr:删除注释代码 · 68cdd6c5
  zhangleyuan committed Jul 06, 2021
  
  68cdd6c5 Browse Files
- style:头部背景图位置调整 · 14a1d68b
  yuananting committed Jul 06, 2021
  
  14a1d68b Browse Files
- 'fix' · 6a8415cf
  zhujian committed Jul 06, 2021
  
  6a8415cf Browse Files
- style:助学工具列表滚动，头部按钮挤压调整 · eee59bce
  yuananting committed Jul 06, 2021
  
  eee59bce Browse Files
- style:视频课表格样式优化 · 3aea1fe7
  guomingpang committed Jul 06, 2021
  
  3aea1fe7 Browse Files
- style:视频课表格样式优化 · b4bdd864
  guomingpang committed Jul 06, 2021
  
  b4bdd864 Browse Files
- style：课程管理列表，时间不换行，列表优化 · 00b1684a
  guomingpang committed Jul 06, 2021
  
  00b1684a Browse Files
- fix:关联课程按钮置灰设置为不可点击 · b54446be
  yuananting committed Jul 06, 2021
  
  b54446be Browse Files
05 Jul, 2021 2 commits
- fix:修复培训计划关联课程数限制失效 · e4673982
  yuananting committed Jul 05, 2021
  
  e4673982 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · cca0d6c9
  guomingpang committed Jul 05, 2021
  
  cca0d6c9 Browse Files
04 Jul, 2021 9 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