Commits · 08b590b605650e8cc610f0fa8bea88e6ec1b51cf · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

23 Jun, 2021 6 commits
- fix:....... · 08b590b6
  maolipeng committed Jun 23, 2021
  
  08b590b6 Browse Files
- fix:过期code修改 · 739832e7
  maolipeng committed Jun 23, 2021
  
  739832e7 Browse Files
- fix:接口过期拦截 · 63436b6c
  maolipeng committed Jun 23, 2021
  
  63436b6c Browse Files
- Merge branch 'feature/maolipeng/youhua' into feature/maolipeng/20210610/zuhuyouhua · 87346e98
```
# Conflicts:
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jun 23, 2021
  87346e98 Browse Files
- fix:过期 code修改 · 0a89e877
  maolipeng committed Jun 23, 2021
  
  0a89e877 Browse Files
- fix:菜单修改，。。。 · 51f06b6a
  maolipeng committed Jun 23, 2021
  
  51f06b6a Browse Files
22 Jun, 2021 8 commits
- fix:菜单优化。。。。 · 23e7fe66
  maolipeng committed Jun 22, 2021
  
  23e7fe66 Browse Files
- fix:样式修改，版本信息参数修改 · bde70f24
  maolipeng committed Jun 22, 2021
  
  bde70f24 Browse Files
- fix:菜单修改。。。 · 598c1e29
  maolipeng committed Jun 22, 2021
  
  598c1e29 Browse Files
- fix:首页多个tip · f95f64a2
  maolipeng committed Jun 22, 2021
  
  f95f64a2 Browse Files
- fix:...... · d28359ab
  maolipeng committed Jun 22, 2021
  
  d28359ab Browse Files
- fix:每周优化。。。。 · 284c4297
  maolipeng committed Jun 22, 2021
  
  284c4297 Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · ba7900dc
```
# Conflicts:
#	src/common/js/user.ts
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jun 22, 2021
  ba7900dc Browse Files
- feat:基本调试完成 · 8120a9da
  maolipeng committed Jun 22, 2021
  
  8120a9da Browse Files
21 Jun, 2021 1 commit
- fix:接口调试。。。。 · aa618b9d
  maolipeng committed Jun 21, 2021
  
  aa618b9d Browse Files
19 Jun, 2021 1 commit
- feat:........ · 85c17b16
  maolipeng committed Jun 19, 2021
  
  85c17b16 Browse Files
18 Jun, 2021 1 commit
- feat:添加全局过期提醒 · 22caeeae
  maolipeng committed Jun 18, 2021
  
  22caeeae Browse Files
17 Jun, 2021 15 commits
- Merge branch 'feature/maolipeng/youhua' into 'master' · 9e611ef6
```
Feature/maolipeng/youhua

See merge request !47
```
  maolipeng committed Jun 17, 2021
  9e611ef6 Browse Files
- fix:.......... · 054837cb
  maolipeng committed Jun 17, 2021
  
  054837cb Browse Files
- Merge branch 'refactor/yuananting/20210615/category-tree-related' into 'master' · 641a814b
```
Refactor/yuananting/20210615/category tree related

See merge request !46
```
  wufan committed Jun 17, 2021
  641a814b Browse Files
- Merge branch 'master' into refactor/yuananting/20210615/category-tree-related · 01a72eb2
  yuananting committed Jun 17, 2021
  
  01a72eb2 Browse Files
- Merge branch 'refactor/wufan/20210615/refactor-UI-resourceDisk' into 'master' · 77f02561
```
Refactor/wufan/20210615/refactor ui resource disk

See merge request !45
```
  wufan committed Jun 17, 2021
  77f02561 Browse Files
- fix:合并master · 0d46d6db
  wufan committed Jun 17, 2021
  
  0d46d6db Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · 4abe35e4
  maolipeng committed Jun 17, 2021
  
  4abe35e4 Browse Files
- style:table宽度调整 · 7976d506
  wufan committed Jun 17, 2021
  
  7976d506 Browse Files
- style:添加员工和添加学员样式调整 · 6e75fbee
  wufan committed Jun 17, 2021
  
  6e75fbee Browse Files
- fix:logo为空时显示默认 · c4556252
  maolipeng committed Jun 17, 2021
  
  c4556252 Browse Files
- style:资料云盘添加成员弹窗表格宽度调整 · 729fdd22
  wufan committed Jun 17, 2021
  
  729fdd22 Browse Files
- fix:用户没有重新上传logo时显示默认logo · 527e3c70
  maolipeng committed Jun 17, 2021
  
  527e3c70 Browse Files
- refactor:去掉无用代码 · 5d4543e4
  wufan committed Jun 17, 2021
  
  5d4543e4 Browse Files
- feat:二维码链接替换 · c01f938d
  maolipeng committed Jun 17, 2021
  
  c01f938d Browse Files
- 'fix · 3ceb4c87
  zhujian committed Jun 17, 2021
  
  3ceb4c87 Browse Files
16 Jun, 2021 8 commits
- Merge branch 'feature/maolipeng/youhua' into 'master' · e45d264e
```
Feature/maolipeng/youhua

See merge request !44
```
  zhujian committed Jun 16, 2021
  e45d264e Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · 342eb4a0
  maolipeng committed Jun 16, 2021
  
  342eb4a0 Browse Files
- feat:tttttttt · 4d72ecc6
  maolipeng committed Jun 16, 2021
  
  4d72ecc6 Browse Files
- Merge branch 'feature/zahngleyuan/20210607/cloud-cass-remodel' into 'master' · a9043c95
```
Feature/zahngleyuan/20210607/cloud cass remodel

See merge request !43
```
  zhangleyuan committed Jun 16, 2021
  a9043c95 Browse Files
- Merge branch 'master' into feature/zahngleyuan/20210607/cloud-cass-remodel · ca9abf13
  zhangleyuan committed Jun 16, 2021
  
  ca9abf13 Browse Files
- feat:调整样式 · 64af316b
  zhangleyuan committed Jun 16, 2021
  
  64af316b Browse Files
- feat:修改样式 · 5ab17b57
  zhangleyuan committed Jun 16, 2021
  
  5ab17b57 Browse Files
- style:样式调整 · 9bb27f43
  zhangleyuan committed Jun 16, 2021
  
  9bb27f43 Browse Files