Commits · 35aafb088e694941785fbae75e4ca9b39c76aa9b · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

09 Jul, 2021 29 commits
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 35aafb08
  yuananting committed Jul 09, 2021
  
  35aafb08 Browse Files
- fix:删除重复合并的代码 · afdb5e13
  yuananting committed Jul 09, 2021
  
  afdb5e13 Browse Files
- fix:课节resourceId修改 · ad629ad5
  yuananting committed Jul 09, 2021
  
  ad629ad5 Browse Files
- fix:解决新增视频课课节唯一标识的冲突 · 23a66d95
  yuananting committed Jul 09, 2021
  
  23a66d95 Browse Files
- fix:新增视频课课节唯一标识 · 07fb38f6
  yuananting committed Jul 09, 2021
  
  07fb38f6 Browse Files
- fix:解决新增视频唯一标识的冲突 · 22f3f09c
  yuananting committed Jul 09, 2021
  
  22f3f09c Browse Files
- fix:添加视频唯一标识字段resourceId · 6510d9ee
  yuananting committed Jul 09, 2021
  
  6510d9ee Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · e2b8eb21
  wufan committed Jul 09, 2021
  
  e2b8eb21 Browse Files
- feat:增加console · 25de7947
  wufan committed Jul 09, 2021
  
  25de7947 Browse Files
- fix:解决去除新增视频id的合并冲突 · bde51e88
  yuananting committed Jul 09, 2021
  
  bde51e88 Browse Files
- fix:新添加的视频不传id · 4d4c9097
  yuananting committed Jul 09, 2021
  
  4d4c9097 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 37a6750d
  yuananting committed Jul 09, 2021
  
  37a6750d Browse Files
- style:详情页底部间距调整 · 15865a4d
  yuananting committed Jul 09, 2021
  
  15865a4d Browse Files
- feat:线上课外部课程课程分类树接口替换 · efa95b63
  yuananting committed Jul 09, 2021
  
  efa95b63 Browse Files
- feat:线上课外部课程课程分类树接口替换 · d139a8e9
  yuananting committed Jul 09, 2021
  
  d139a8e9 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 70a3acc2
  zhujian committed Jul 09, 2021
  
  70a3acc2 Browse Files
- 'fix' · db004aa7
  zhujian committed Jul 09, 2021
  
  db004aa7 Browse Files
- 'fix' · 3227be7a
  zhujian committed Jul 09, 2021
  
  3227be7a Browse Files
- fix:视频详情页课节序号调整 · 5276872c
  yuananting committed Jul 09, 2021
  
  5276872c Browse Files
- feat:去掉无用代码 · 535010ce
  wufan committed Jul 09, 2021
  
  535010ce Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 5e2c283c
  wufan committed Jul 09, 2021
  
  5e2c283c Browse Files
- feat：添加课节数20个限制 · cb312b50
  wufan committed Jul 09, 2021
  
  cb312b50 Browse Files
- fix:解决合并细节优化的冲突 · 8f1de292
  yuananting committed Jul 09, 2021
  
  8f1de292 Browse Files
- fix:序号调整+课节数字段补充 · e9f49fc6
  yuananting committed Jul 09, 2021
  
  e9f49fc6 Browse Files
- fix:添加因合并分支丢失的视频上传相关方法的代码 · 59fa070f
  yuananting committed Jul 09, 2021
  
  59fa070f Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 3ef91dc7
  wufan committed Jul 09, 2021
  
  3ef91dc7 Browse Files
- feat:优化外部课展示栏 · cb42c593
  wufan committed Jul 09, 2021
  
  cb42c593 Browse Files
- feat:解决合并代码后的冲突 · 10160b25
  zhangleyuan committed Jul 09, 2021
  
  10160b25 Browse Files
- feat:处理前往学院的码 · 9b034827
  zhangleyuan committed Jul 09, 2021
  
  9b034827 Browse Files
08 Jul, 2021 11 commits
- fix:解决合并周优化的分支冲突 · 27a89940
  yuananting committed Jul 08, 2021
  
  27a89940 Browse Files
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 1f5b217c
  wufan committed Jul 08, 2021
  
  1f5b217c Browse Files
- Merge branch 'refactor/wufan/20210702/teach-tool-empty-picture' into 'master' · 806f97d6
```
Refactor/wufan/20210702/teach tool empty picture

See merge request !66
```
  wufan committed Jul 08, 2021
  806f97d6 Browse Files
- Merge branch 'master' into refactor/wufan/20210702/teach-tool-empty-picture · a34a356e
  wufan committed Jul 08, 2021
  
  a34a356e Browse Files
- Merge branch 'feature/maolipeng/youhua' into 'master' · 63a84197
```
Feature/maolipeng/youhua

See merge request !65
```
  maolipeng committed Jul 08, 2021
  63a84197 Browse Files
- feat:新建线上课样式优化 · 2e80dc54
  wufan committed Jul 08, 2021
  
  2e80dc54 Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · d64fb254
  maolipeng committed Jul 08, 2021
  
  d64fb254 Browse Files
- 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
- Merge branch 'feature/wufan/20210701/course-B-reform' into dev · 532cc394
  yuananting committed Jul 08, 2021
  
  532cc394 Browse Files
- fix:培训计划关联课程视频课封面修改 · 1e631a44
  yuananting committed Jul 08, 2021
  
  1e631a44 Browse Files
- feat:删除注释 · b41087ac
  zhangleyuan committed Jul 08, 2021
  
  b41087ac Browse Files