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

17 Aug, 2021 3 commits
- Merge branch 'feature/pangguoming/20210805/wechat_audit' into dev · a4bfe5ef
  guomingpang committed Aug 17, 2021
  
  a4bfe5ef Browse Files
- Merge branch 'dev' of… · 9f343476
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Aug 17, 2021
  9f343476 Browse Files
- fix:测试bug修复 · dff9da6f
  guomingpang committed Aug 17, 2021
  
  dff9da6f Browse Files
16 Aug, 2021 30 commits
- fix:解决合并代码的冲突 · 3f74ea5d
  yuananting committed Aug 16, 2021
  
  3f74ea5d Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' of… · 5ed3f210
```
Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
```
  yuananting committed Aug 16, 2021
  5ed3f210 Browse Files
- feat:联调课程关联培训任务接口 · 2911dfd7
  yuananting committed Aug 16, 2021
  
  2911dfd7 Browse Files
- fix:rtyuiop · e8ae7a18
  zhujian committed Aug 16, 2021
  
  e8ae7a18 Browse Files
- fix:失效课程联调 · 3999cd76
  zhujian committed Aug 16, 2021
  
  3999cd76 Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' of… · 7befe2aa
```
Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
```
  yuananting committed Aug 16, 2021
  7befe2aa Browse Files
- fix:课程关联培训任务接口联调 · 5c68839f
  yuananting committed Aug 16, 2021
  
  5c68839f Browse Files
- fix · 4a2c1121
  zhujian committed Aug 16, 2021
  
  4a2c1121 Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' into dev · d8339d76
  yuananting committed Aug 16, 2021
  
  d8339d76 Browse Files
- feat:指派对象弹窗搜索联调完毕 · ff4c1d39
  yuananting committed Aug 16, 2021
  
  ff4c1d39 Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' into dev · e9664081
  yuananting committed Aug 16, 2021
  
  e9664081 Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' of… · c54209d0
```
Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
```
  yuananting committed Aug 16, 2021
  c54209d0 Browse Files
- fix:历史记录接口联调，已选课程过滤 · fe30365a
  yuananting committed Aug 16, 2021
  
  fe30365a Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' into dev · e812659a
  zhujian committed Aug 16, 2021
  
  e812659a Browse Files
- fix · 44af767b
  zhujian committed Aug 16, 2021
  
  44af767b Browse Files
- fix:tooltips · a8cb5668
  zhujian committed Aug 16, 2021
  
  a8cb5668 Browse Files
- fix:tooltips · d6c29ab5
  zhujian committed Aug 16, 2021
  
  d6c29ab5 Browse Files
- fix · d7f444d9
  zhujian committed Aug 16, 2021
  
  d7f444d9 Browse Files
- fix:排序 · 45cc51ab
  zhujian committed Aug 16, 2021
  
  45cc51ab Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' into dev · 486955e2
  yuananting committed Aug 16, 2021
  
  486955e2 Browse Files
- fix:修复高级设置完成标准参数错误 · 65495721
  yuananting committed Aug 16, 2021
  
  65495721 Browse Files
- fix:解决合并代码的冲突 · 5314960e
  yuananting committed Aug 16, 2021
  
  5314960e Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' of… · 571796c7
```
Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
```
  yuananting committed Aug 16, 2021
  571796c7 Browse Files
- fix:考试时长分钟改毫秒 · ff1d1bb0
  yuananting committed Aug 16, 2021
  
  ff1d1bb0 Browse Files
- fix · e6cb1d98
  zhujian committed Aug 16, 2021
  
  e6cb1d98 Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' of… · 4f691a3e
```
Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
```
  yuananting committed Aug 16, 2021
  4f691a3e Browse Files
- feat:指派对象弹窗搜索接口联调 · 12e97a4a
  yuananting committed Aug 16, 2021
  
  12e97a4a Browse Files
- feat:联调考试详情 · da7802cb
  wufan committed Aug 16, 2021
  
  da7802cb Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' into dev · ce5b164f
  yuananting committed Aug 16, 2021
  
  ce5b164f Browse Files
- fix:发布入参名称错误 · 0366c5b3
  yuananting committed Aug 16, 2021
  
  0366c5b3 Browse Files
15 Aug, 2021 2 commits
- Merge branch 'feature/yuananting/20210801/task-center' into dev · 68e170c4
  yuananting committed Aug 15, 2021
  
  68e170c4 Browse Files
- fix:修复新建培训任务高级设置数据问题 · 87dec267
  yuananting committed Aug 15, 2021
  
  87dec267 Browse Files
14 Aug, 2021 5 commits
- Merge branch 'feature/yuananting/20210801/task-center' into dev · 92c14429
  yuananting committed Aug 14, 2021
  
  92c14429 Browse Files
- Merge branch 'feature/yuananting/20210801/task-center' of… · f7cf0109
```
Merge branch 'feature/yuananting/20210801/task-center' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210801/task-center
```
  yuananting committed Aug 14, 2021
  f7cf0109 Browse Files
- fix:列表样式调整、列表数据更新补充 · e7744cf6
  yuananting committed Aug 14, 2021
  
  e7744cf6 Browse Files
- Merge branch 'dev' of… · 04a98954
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Aug 14, 2021
  04a98954 Browse Files
- Merge branch 'feature/zhujian/0726/qwLiving' into dev · 705bf6ca
  maolipeng committed Aug 14, 2021
  
  705bf6ca Browse Files