Commits · 99d7b9e415b8e889e617ecae4031b92bfb4b4451 · xiaomai-cloud-class / xiaomai-cloud-class-web

01 Aug, 2021 4 commits
- 'fix:合并分支冲突' · 99d7b9e4
  zhujian committed Aug 01, 2021
  
  99d7b9e4 Browse Files
- fix · 18e64979
  zhujian committed Aug 01, 2021
  
  18e64979 Browse Files
- 品牌替换 · 60bcf37b
  zhujian committed Aug 01, 2021
  
  60bcf37b Browse Files
- 品牌替换 · b5ee4a25
  zhujian committed Aug 01, 2021
  
  b5ee4a25 Browse Files
29 Jul, 2021 1 commit
- fix · da3e88e3
  zhujian committed Jul 29, 2021
  
  da3e88e3 Browse Files
28 Jul, 2021 11 commits
- Merge branch 'feature/pangguoming/202010722/modify_banner_size' into dev · 1eb551e7
  guomingpang committed Jul 28, 2021
  
  1eb551e7 Browse Files
- style: l l l ll l l lcategorySonName · a0a455ba
  guomingpang committed Jul 28, 2021
  
  a0a455ba Browse Files
- Merge branch 'feature/pangguoming/202010722/modify_banner_size' into dev · 76cf0d17
  guomingpang committed Jul 28, 2021
  
  76cf0d17 Browse Files
- style:线下课活动搜索名称过长问题修复 · c0226200
  guomingpang committed Jul 28, 2021
  
  c0226200 Browse Files
- fix:解决merge冲突 · f2bdc566
  guomingpang committed Jul 28, 2021
  
  f2bdc566 Browse Files
- Merge branch 'dev' of… · 2541b6b8
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 28, 2021
  2541b6b8 Browse Files
- docs:线下课重命名线下活动，资源云盘变更为素材库 · e0eafc54
  guomingpang committed Jul 28, 2021
  
  e0eafc54 Browse Files
- Merge branch 'refactor/yuananting/20210722/aidtool-UI' into dev · 125c43aa
  yuananting committed Jul 28, 2021
  
  125c43aa Browse Files
- style:助学工具考试列表样式调整 · 5972f6ad
  yuananting committed Jul 28, 2021
  
  5972f6ad Browse Files
- Merge branch 'refactor/yuananting/20210722/aidtool-UI' into dev · b6b8e5db
  yuananting committed Jul 28, 2021
  
  b6b8e5db Browse Files
- style:助学工具分类树弹窗滚动修改 · 533c7d38
  yuananting committed Jul 28, 2021
  
  533c7d38 Browse Files
27 Jul, 2021 14 commits
- Merge branch 'dev' of… · 0ee021f5
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 27, 2021
  0ee021f5 Browse Files
- Merge branch 'feature/maolipeng/youhua' into dev · b6f5662e
  maolipeng committed Jul 27, 2021
  
  b6f5662e Browse Files
- fix:文案修改。。。。 · 2cbaff72
  maolipeng committed Jul 27, 2021
  
  2cbaff72 Browse Files
- fix:解决线下课分类修改导致代码覆盖缺失问题 · c6ce3801
  yuananting committed Jul 27, 2021
  
  c6ce3801 Browse Files
- Merge branch 'dev' of… · 3e668c78
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  yuananting committed Jul 27, 2021
  3e668c78 Browse Files
- Merge branch 'refactor/yuananting/20210722/aidtool-UI' into dev · e6d06943
  yuananting committed Jul 27, 2021
  
  e6d06943 Browse Files
- style:弹窗分类树滚动条调整 · d27d2687
  yuananting committed Jul 27, 2021
  
  d27d2687 Browse Files
- fix:merge master · 0fcfcd6a
  guomingpang committed Jul 27, 2021
  
  0fcfcd6a Browse Files
- erge:merge master · 64195835
  guomingpang committed Jul 27, 2021
  
  64195835 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · 3a60ab2c
  guomingpang committed Jul 27, 2021
  
  3a60ab2c Browse Files
- Merge branch 'dev' of… · cda9ed1c
```
Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev
```
  guomingpang committed Jul 27, 2021
  cda9ed1c Browse Files
- Merge branch 'refactor/yuananting/20210722/aidtool-UI' into dev · 0ab2e047
  yuananting committed Jul 27, 2021
  
  0ab2e047 Browse Files
- style:调整新建试卷列表缺省图显示不完整的问题 · 6f8662e7
  yuananting committed Jul 27, 2021
  
  6f8662e7 Browse Files
- style:助学工具模块弹窗样式调整 · 93a24d95
  yuananting committed Jul 27, 2021
  
  93a24d95 Browse Files
26 Jul, 2021 5 commits
- Merge branch 'feature/maolipeng/youhua' into dev · 045f310e
```
# Conflicts:
#	src/modules/college-manage/EmployeeManage.tsx
```
  maolipeng committed Jul 26, 2021
  045f310e Browse Files
- feat:员工管理替换为角色管理 · 8e421697
  maolipeng committed Jul 26, 2021
  
  8e421697 Browse Files
- feat:每周优化文案修改 · 24e72d5f
  maolipeng committed Jul 26, 2021
  
  24e72d5f Browse Files
- feat:课程管理添加课程分类组件 · 16aa9fb7
  guomingpang committed Jul 26, 2021
  
  16aa9fb7 Browse Files
- feat:课程管理添加课程分类组件 · f3778a3c
  guomingpang committed Jul 26, 2021
  
  f3778a3c Browse Files
25 Jul, 2021 1 commit

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

committed Jul 25, 2021

f56e6a3a Browse Files

23 Jul, 2021 4 commits
- Merge branch 'feature/yuananting/20210722/fix-offline-switcher' into 'master' · 4f646be7
```
Feature/yuananting/20210722/fix offline switcher

See merge request !75
```
  yuananting committed Jul 23, 2021
  4f646be7 Browse Files
- fix:合并周优化并解决冲突 · b76ef7f6
  wufan committed Jul 23, 2021
  
  b76ef7f6 Browse Files
- feat:分类管理间距调整 · 9c14e4d3
  wufan committed Jul 23, 2021
  
  9c14e4d3 Browse Files
- fix:解决合并代码的冲突 · e3fdcc84
  yuananting committed Jul 23, 2021
  
  e3fdcc84 Browse Files