Commits · 4da6fdf3c5c190c98ffa73daf1651b5d280eaa56 · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

06 Jul, 2021 25 commits
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 4da6fdf3
  guomingpang committed Jul 06, 2021
  
  4da6fdf3 Browse Files
- Merge branch 'feature/yuananting/20210705/select-course-limit' into rc · 34c768e8
  yuananting committed Jul 06, 2021
  
  34c768e8 Browse Files
- style:头部按钮位置调整 · 9ae443c4
  yuananting committed Jul 06, 2021
  
  9ae443c4 Browse Files
- Merge branch 'feature/pangguoming/202010704/style_update' into rc · f7437709
  guomingpang committed Jul 06, 2021
  
  f7437709 Browse Files
- docs:去掉LiveCourseList.jsx文件中多余的代码Type · 890189f5
  guomingpang committed Jul 06, 2021
  
  890189f5 Browse Files
- styles:课程管理表格优化；删除无用的代码，修复eslint waring · f2841625
  guomingpang committed Jul 06, 2021
  
  f2841625 Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 138406a8
  guomingpang committed Jul 06, 2021
  
  138406a8 Browse Files
- docs:修复liveliveCourseList eslint警告 · 4b287ee4
  guomingpang committed Jul 06, 2021
  
  4b287ee4 Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · da6d8229
  guomingpang committed Jul 06, 2021
  
  da6d8229 Browse Files
- Merge branch 'feature/maolipeng/youhua' into rc · 97e97ca3
  maolipeng committed Jul 06, 2021
  
  97e97ca3 Browse Files
- docs:删除无用的appid · 1cdc2bca
  guomingpang committed Jul 06, 2021
  
  1cdc2bca Browse Files
- fix:sbide · 310ca455
  maolipeng committed Jul 06, 2021
  
  310ca455 Browse Files
- feat:解决合并代码后的冲突 · 4b09e466
  zhangleyuan committed Jul 06, 2021
  
  4b09e466 Browse Files
- featr:删除注释代码 · 68cdd6c5
  zhangleyuan committed Jul 06, 2021
  
  68cdd6c5 Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · eb24988f
  guomingpang committed Jul 06, 2021
  
  eb24988f Browse Files
- Merge branch 'feature/yuananting/20210705/select-course-limit' into rc · cd5e6544
  yuananting committed Jul 06, 2021
  
  cd5e6544 Browse Files
- style:头部背景图位置调整 · 14a1d68b
  yuananting committed Jul 06, 2021
  
  14a1d68b Browse Files
- fix:解决合并修复培训计划关联课程数限制失效的冲突 · a2f6cf9c
  yuananting committed Jul 06, 2021
  
  a2f6cf9c Browse Files
- fix:adadadasdasd · f50c7422
  maolipeng committed Jul 06, 2021
  
  f50c7422 Browse Files
- style:助学工具列表滚动，头部按钮挤压调整 · eee59bce
  yuananting committed Jul 06, 2021
  
  eee59bce Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · b6bee1f2
```
# Conflicts:
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jul 06, 2021
  b6bee1f2 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 3 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
- 'fix' · 2a842293
  zhujian committed Jul 05, 2021
  
  2a842293 Browse Files
04 Jul, 2021 12 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
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · e04470d1
```
# Conflicts:
#	src/modules/home/Home.jsx
```
  maolipeng committed Jul 04, 2021
  e04470d1 Browse Files
- fix:sdasdadadasd · 7efa89ff
  maolipeng committed Jul 04, 2021
  
  7efa89ff Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 09274132
```
# 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/Menu.tsx
```
  maolipeng committed Jul 04, 2021
  09274132 Browse Files