Commits · 144aef25eb204e15392a6b411a929948de65be8a · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

25 Jun, 2021 8 commits
- fix:新建课程时过期提醒 · 144aef25
  maolipeng committed Jun 25, 2021
  
  144aef25 Browse Files
- fix:首页过期提醒修复 · 4b9a2f51
  maolipeng committed Jun 25, 2021
  
  4b9a2f51 Browse Files
- fix:人数限制修改 · 3399b915
  maolipeng committed Jun 25, 2021
  
  3399b915 Browse Files
- fix:员工学员数显示不准修复 · c425abcd
  maolipeng committed Jun 25, 2021
  
  c425abcd Browse Files
- fix:到期文案修改 · abfd7bda
  maolipeng committed Jun 25, 2021
  
  abfd7bda Browse Files
- fix:....... · b3f22742
  maolipeng committed Jun 25, 2021
  
  b3f22742 Browse Files
- fix:增加不限人数 · d30ca86c
  maolipeng committed Jun 25, 2021
  
  d30ca86c Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · 39090150
```
# Conflicts:
#	src/common/js/axios.ts
#	src/common/js/user.ts
#	src/modules/college-manage/UserManagePage.tsx
#	src/modules/root/Login.jsx
```
  maolipeng committed Jun 25, 2021
  39090150 Browse Files
24 Jun, 2021 24 commits
- Revert "fix:菜单栏优化" · f481a767
```
This reverts commit f022a67e.
```
  zhujian committed Jun 24, 2021
  f481a767 Browse Files
- Merge branch 'feature/wufan/2010621/replace-empty-picture' into 'master' · a715db1c
```
Feature/wufan/2010621/replace empty picture

See merge request !52
```
  wufan committed Jun 24, 2021
  a715db1c Browse Files
- Merge branch 'master' into feature/wufan/2010621/replace-empty-picture · a8e0b8af
  wufan committed Jun 24, 2021
  
  a8e0b8af Browse Files
- Merge branch 'feature/maolipeng/youhua' into 'master' · 9e1ba3d2
```
Feature/maolipeng/youhua

See merge request !51
```
  maolipeng committed Jun 24, 2021
  9e1ba3d2 Browse Files
- fix:样式调整。。。 · 44fa3846
  maolipeng committed Jun 24, 2021
  
  44fa3846 Browse Files
- Merge branch 'master' into feature/maolipeng/youhua · 58a98d51
  maolipeng committed Jun 24, 2021
  
  58a98d51 Browse Files
- Merge branch 'hotfix/zhangleyuan/20210619/storeuserId' into 'master' · 6473fa7c
```
Hotfix/zhangleyuan/20210619/storeuser

See merge request !50
```
  wufan committed Jun 24, 2021
  6473fa7c Browse Files
- feat:去除console · fca84a2d
  zhangleyuan committed Jun 24, 2021
  
  fca84a2d Browse Files
- feat:删除无用代码 · 99519c54
  zhangleyuan committed Jun 24, 2021
  
  99519c54 Browse Files
- feat:解决合并代码后的冲突 · 1bad31cd
  zhangleyuan committed Jun 24, 2021
  
  1bad31cd Browse Files
- Merge branch 'feature/pangguoming/20210622/login_page_modify' into 'master' · be13851c
```
Feature/pangguoming/20210622/login page modify

See merge request !49
```
  wufan committed Jun 24, 2021
  be13851c Browse Files
- doct: 添加隐藏手机入口的注释提示 · cc4713e6
  guomingpang committed Jun 24, 2021
  
  cc4713e6 Browse Files
- fix：去掉yarn.lock修改 · 00994e6d
  guomingpang committed Jun 24, 2021
  
  00994e6d Browse Files
- Merge branch 'master' into feature/pangguoming/20210622/login_page_modify · a40a38c4
  guomingpang committed Jun 24, 2021
  
  a40a38c4 Browse Files
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · 92b8a8c8
  guomingpang committed Jun 24, 2021
  
  92b8a8c8 Browse Files
- Merge branch 'feature/yuananting/20210619/help-center-enter' into 'master' · 62d9db03
```
Feature/yuananting/20210619/help center enter

See merge request !48
```
  wufan committed Jun 24, 2021
  62d9db03 Browse Files
- Merge branch 'feature/zhangleyuan/20210622/store-logo' into hotfix/zhangleyuan/20210619/storeuserId · 58c58cfc
  zhangleyuan committed Jun 24, 2021
  
  58c58cfc Browse Files
- fix:联系我们弹窗封装 · ee671dd0
  maolipeng committed Jun 24, 2021
  
  ee671dd0 Browse Files
- fix:过期提醒优化 · 9b368a77
  maolipeng committed Jun 24, 2021
  
  9b368a77 Browse Files
- feat:课程分类搜索添加搜索默认图 · bc01c551
  wufan committed Jun 24, 2021
  
  bc01c551 Browse Files
- feat:分类管理添加搜索默认图 · 9ac7939a
  wufan committed Jun 24, 2021
  
  9ac7939a Browse Files
- fix:菜单栏优化 · f022a67e
  maolipeng committed Jun 24, 2021
  
  f022a67e Browse Files
- fix:菜单栏优化 · 3fda9f21
  maolipeng committed Jun 24, 2021
  
  3fda9f21 Browse Files
- fix:文案修改。。。。 · 761f9c24
  maolipeng committed Jun 24, 2021
  
  761f9c24 Browse Files
23 Jun, 2021 8 commits
- fix:接口修改。。。。 · 01c144f7
  maolipeng committed Jun 23, 2021
  
  01c144f7 Browse Files
- fix:antd版本号修改 · 57af7a81
  maolipeng committed Jun 23, 2021
  
  57af7a81 Browse Files
- Merge branch 'feature/maolipeng/youhua' into feature/maolipeng/20210610/zuhuyouhua · d8557afd
```
# Conflicts:
#	yarn.lock
```
  maolipeng committed Jun 23, 2021
  d8557afd Browse Files
- fix:左侧菜单优化 · 4fa775ed
  maolipeng committed Jun 23, 2021
  
  4fa775ed Browse Files
- fix:左侧菜单悬浮展开 · eb16f661
  maolipeng committed Jun 23, 2021
  
  eb16f661 Browse Files
- fix:....... · 08b590b6
  maolipeng committed Jun 23, 2021
  
  08b590b6 Browse Files
- fix:。。。。。。。。 · 82ad4c80
  maolipeng committed Jun 23, 2021
  
  82ad4c80 Browse Files
- feat:解决合并代码后的冲突 · d80b7351
  zhangleyuan committed Jun 23, 2021
  
  d80b7351 Browse Files