Commits · 867ef47098c00c9bec7833b9d205c4deeaf15cbe · new-sing / admin-base

23 Aug, 2019 1 commit
- 822 · 867ef470
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  867ef470
22 Aug, 2019 5 commits
- 822 · da9c0259
  chenyishuai@singsingenglish.com authored Aug 22, 2019
  
  da9c0259
- Merge branch 'dev' · 2ad1daf2
  chenyishuai@singsingenglish.com authored Aug 22, 2019
  
  2ad1daf2
- 822 · 2cc08fc6
  chenyishuai@singsingenglish.com authored Aug 22, 2019
  
  2cc08fc6
- Merge branch 'callback' into dev · b64254e1
  赵茹林 authored Aug 22, 2019
```
# Conflicts:
#	src/util/wordbook.js
```
  b64254e1
- 回访信息 - 标签新增、编辑、删除 · 9de13154
  赵茹林 authored Aug 22, 2019
```
回访信息 - 列表 展示、新增
```
  9de13154
20 Aug, 2019 9 commits
- 820 · 5cdc6d96
  chenyishuai@singsingenglish.com authored Aug 20, 2019
  
  5cdc6d96
- Merge branch 'dev' · e07f96a0
  chenyishuai@singsingenglish.com authored Aug 20, 2019
  
  e07f96a0
- 增加一次性物流信息最后更新时间 · 06cccc36
  赵茹林 authored Aug 20, 2019
```
修复 一次性物流信息 导出无效
```
  06cccc36
- update · 68344a42
  赵茹林 authored Aug 20, 2019
  
  68344a42
- 820 · c20415d5
  chenyishuai@singsingenglish.com authored Aug 20, 2019
  
  c20415d5
- Merge branch 'dev' · 4a30b10d
  chenyishuai@singsingenglish.com authored Aug 20, 2019
  
  4a30b10d
- update · d29b945e
  赵茹林 authored Aug 20, 2019
  
  d29b945e
- update · 74ed0710
  赵茹林 authored Aug 20, 2019
  
  74ed0710
- 新增一次性物流信息编辑 · dd43036e
  赵茹林 authored Aug 20, 2019
  
  dd43036e
19 Aug, 2019 2 commits
- 新增一次性物流信息展示、筛选、导出（编辑todo） · 0f3705a5
  赵茹林 authored Aug 19, 2019
  
  0f3705a5
- 新增用户信息接口对接 · a6758f51
  赵茹林 authored Aug 19, 2019
```
新增 用户标签接口对接
```
  a6758f51
16 Aug, 2019 3 commits
- 816 · 7c21be31
  chenyishuai@singsingenglish.com authored Aug 16, 2019
  
  7c21be31
- Merge branch 'dev' · 92f4c97b
  chenyishuai@singsingenglish.com authored Aug 16, 2019
  
  92f4c97b
- Merge branch 'dev' · d6d1f58e
  chenyishuai@singsingenglish.com authored Aug 16, 2019
  
  d6d1f58e
15 Aug, 2019 8 commits
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · 5792c118
  赵茹林 authored Aug 15, 2019
  
  5792c118
- 修复商品日课月课切换不对的问题 · 88692bdb
  赵茹林 authored Aug 15, 2019
  
  88692bdb
- 815 · 571ac592
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  571ac592
- Merge branch 'master' into dev · cfb86794
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  cfb86794
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev · dab733d3
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  dab733d3
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin · f9ee9372
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  f9ee9372
- 修复编辑商品看不到课程列表的问题 · a57e31b9
  赵茹林 authored Aug 15, 2019
  
  a57e31b9
- 新增导出完课用户的权限 · fa719c17
  赵茹林 authored Aug 15, 2019
  
  fa719c17
14 Aug, 2019 12 commits
- 814 · 3fb4993c
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  3fb4993c
- Merge branch 'dev' · ac9d3c71
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  ac9d3c71
- update · ad61aa1e
  赵茹林 authored Aug 14, 2019
  
  ad61aa1e
- 814 · c70bf725
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  c70bf725
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · c0bb4e35
  赵茹林 authored Aug 14, 2019
  
  c0bb4e35
- 更新最近更新时间 · 55a2fe29
  赵茹林 authored Aug 14, 2019
  
  55a2fe29
- 814 · 82c6eb09
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  82c6eb09
- 814 · f56be171
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  f56be171
- Merge branch 'master' into dev · 6740ee96
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  6740ee96
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · bdee372f
  赵茹林 authored Aug 14, 2019
  
  bdee372f
- 新增导出完课用户 · 4622dd7a
  赵茹林 authored Aug 14, 2019
```
新增 数据管理更新时间
新增 设备移交原因
新增 用户转移
更新 期数名称3个
优化 选择用户样式
```
  4622dd7a
- 814 · e62447b9
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  e62447b9