Commits · 8adf6055f18b16c823bbd4fbc64f48485de176f8 · xiaomai-cloud-class / xiaomai-cloud-class-web · GitLab

01 Jul, 2021 8 commits
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 8adf6055
  maolipeng committed Jul 01, 2021
  
  8adf6055 Browse Files
- fix:到期提醒时间格式修改 · 6ae29f73
  maolipeng committed Jul 01, 2021
  
  6ae29f73 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 76bbf35e
  maolipeng committed Jul 01, 2021
  
  76bbf35e Browse Files
- fix:起止时间一样的情况 · bd13213b
  maolipeng committed Jul 01, 2021
  
  bd13213b Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 4426433e
  maolipeng committed Jul 01, 2021
  
  4426433e Browse Files
- fix:左侧菜单栏交互优化 · f8cdd825
  maolipeng committed Jul 01, 2021
  
  f8cdd825 Browse Files
- Merge branch 'feature/yuananting/20210624/replace_empty_picture' into rc · 903b9e50
  yuananting committed Jul 01, 2021
  
  903b9e50 Browse Files
- fix:直播课分享海报默认图破损修复 · 6d1ef729
  yuananting committed Jul 01, 2021
  
  6d1ef729 Browse Files
30 Jun, 2021 20 commits
- doct:上传yarn。lock文件 · c0fcec6e
  guomingpang committed Jun 30, 2021
  
  c0fcec6e Browse Files
- Merge branch 'hotfix/pangguoming/20210629/modify_course_manage_default_img' into rc · 97bdcf23
  guomingpang committed Jun 30, 2021
  
  97bdcf23 Browse Files
- doct:上传yarn。lock文件 · b942d6ac
  guomingpang committed Jun 30, 2021
  
  b942d6ac Browse Files
- doct:上传yarn。lock文件 · 8b74d747
  guomingpang committed Jun 30, 2021
  
  8b74d747 Browse Files
- Merge branch 'hotfix/pangguoming/20210629/modify_course_manage_default_img' into rc · d8fc7b3e
  guomingpang committed Jun 30, 2021
  
  d8fc7b3e Browse Files
- fix:选中菜单高亮bug修复 · ba152088
  guomingpang committed Jun 30, 2021
  
  ba152088 Browse Files
- fix:选中菜单高亮bug修复 · 37f7083a
  guomingpang committed Jun 30, 2021
  
  37f7083a Browse Files
- fix:选中菜单高亮bug修复 · bcba4ba8
  guomingpang committed Jun 30, 2021
  
  bcba4ba8 Browse Files
- Merge branch 'hotfix/pangguoming/20210629/modify_course_manage_default_img' into rc · 1fd53f12
  guomingpang committed Jun 30, 2021
  
  1fd53f12 Browse Files
- fix:选中菜单高亮bug修复 · 86311693
  guomingpang committed Jun 30, 2021
  
  86311693 Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 3e052e15
  guomingpang committed Jun 30, 2021
  
  3e052e15 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 76f2be90
  maolipeng committed Jun 30, 2021
  
  76f2be90 Browse Files
- fix:XMQXY-446 · 80c45900
  maolipeng committed Jun 30, 2021
  
  80c45900 Browse Files
- fix:ui修改。。。 · afd51a60
  maolipeng committed Jun 30, 2021
  
  afd51a60 Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 2ef5915d
  guomingpang committed Jun 30, 2021
  
  2ef5915d Browse Files
- feat:周优化课程管理缺省图，导航菜单栏收起时选中栏高亮 · 54184cb7
  guomingpang committed Jun 30, 2021
  
  54184cb7 Browse Files
- feat:解决合并代码后的冲突 · e1e13e0c
  zhangleyuan committed Jun 30, 2021
  
  e1e13e0c Browse Files
- Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc · 937c309d
  guomingpang committed Jun 30, 2021
  
  937c309d Browse Files
- Merge branch 'feature/yuananting/20210624/replace_empty_picture' into rc · 8270c55e
  yuananting committed Jun 30, 2021
  
  8270c55e Browse Files
- fix:考试详情题目数据序号取index · 1be68445
  yuananting committed Jun 30, 2021
  
  1be68445 Browse Files
29 Jun, 2021 8 commits
- feat:课程管理缺省图替换，导航栏收起高亮 · 21e43782
  guomingpang committed Jun 29, 2021
  
  21e43782 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · d2e2861d
  maolipeng committed Jun 29, 2021
  
  d2e2861d Browse Files
- fix:续费文案修改 · 80dae9bc
  maolipeng committed Jun 29, 2021
  
  80dae9bc Browse Files
- feat:课程管理缺省图替换，导航栏收起高亮 · 718ee023
  guomingpang committed Jun 29, 2021
  
  718ee023 Browse Files
- feat:课程管理缺省图替换，导航栏收起高亮 · 510254f6
  guomingpang committed Jun 29, 2021
  
  510254f6 Browse Files
- Merge branch 'refactor/yuanating/20210625/collage-init' into rc · 15c51a99
  yuananting committed Jun 29, 2021
  
  15c51a99 Browse Files
- fix:后端创建时间默认值约定修改 · c7c2c4e7
  yuananting committed Jun 29, 2021
  
  c7c2c4e7 Browse Files
- fix:...xxxx · fc8311fb
  maolipeng committed Jun 29, 2021
  
  fc8311fb Browse Files
28 Jun, 2021 4 commits
- Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web · f803fff4
  guomingpang committed Jun 28, 2021
  
  f803fff4 Browse Files
- Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc · 87a64aef
```
# Conflicts:
#	src/data-source/base/request-apis.ts
#	src/domains/basic-domain/baseService.ts
#	src/modules/course-manage/components/LiveCourseList.jsx
```
  maolipeng committed Jun 28, 2021
  87a64aef Browse Files
- Merge branch 'master' into feature/maolipeng/20210610/zuhuyouhua · 587cdfab
```
# Conflicts:
#	src/modules/root/Menu.tsx
```
  maolipeng committed Jun 28, 2021
  587cdfab Browse Files
- fix:获取版本信息提升到app.tsx · e935b932
  maolipeng committed Jun 28, 2021
  
  e935b932 Browse Files