Commits · 1d6ca08304011728872b317ebb171d985343cfc5 · new-sing / admin-base

29 Aug, 2019 1 commit
- 课程列表修复日课、月课切换异常的问题 · 1d6ca083
  赵茹林 authored Aug 29, 2019
  
  1d6ca083
23 Aug, 2019 15 commits
- master-测试 · 59f53120
  IvyXia123 authored Aug 23, 2019
  
  59f53120
- 代码上传 · 283a141a
  IvyXia123 authored Aug 23, 2019
  
  283a141a
- 823 · edfb036b
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  edfb036b
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev · 054e1bd3
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  054e1bd3
- 823 · 6c9b1f24
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  6c9b1f24
- 代码 · 191a9e10
  IvyXia123 authored Aug 23, 2019
  
  191a9e10
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · 0deb1bae
  赵茹林 authored Aug 23, 2019
  
  0deb1bae
- 回访新增标签编辑界面，鼠标hover显示标签备注 · 4a5ead26
  赵茹林 authored Aug 23, 2019
  
  4a5ead26
- dev · 850d8260
  IvyXia123 authored Aug 23, 2019
  
  850d8260
- 823 · 1f6d6e4c
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  1f6d6e4c
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev · a49e1e49
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  a49e1e49
- 822 · c8d6c13b
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  c8d6c13b
- 822 · 867ef470
  chenyishuai@singsingenglish.com authored Aug 23, 2019
  
  867ef470
- 客户管理所有测试 · 16762129
  IvyXia123 authored Aug 23, 2019
  
  16762129
- 回访信息修复添加回访信息绑定老师不对的bug · 2b660a92
  赵茹林 authored Aug 23, 2019
  
  2b660a92
22 Aug, 2019 11 commits
- 回访信息修复分页问题 · 682884b1
  赵茹林 authored Aug 22, 2019
  
  682884b1
- 员工管理新增岗位类型（销售，助教，TMK，增长） · ac8f95e5
  赵茹林 authored Aug 22, 2019
  
  ac8f95e5
- 代码提交 · 4acb44b6
  IvyXia123 authored Aug 22, 2019
  
  4acb44b6
- Merge branch 'dev' · 3484a74f
  IvyXia123 authored Aug 22, 2019
  
  3484a74f
- 代码提交 · ddf5cef0
  IvyXia123 authored Aug 22, 2019
  
  ddf5cef0
- 客户管理 · 8832bcb4
  IvyXia123 authored Aug 22, 2019
  
  8832bcb4
- 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 3 commits
- 新增一次性物流信息展示、筛选、导出（编辑todo） · 0f3705a5
  赵茹林 authored Aug 19, 2019
  
  0f3705a5
- 新增用户信息接口对接 · a6758f51
  赵茹林 authored Aug 19, 2019
```
新增 用户标签接口对接
```
  a6758f51
- 实时数据基本信息 · 1e4e41ea
  赵茹林 authored Aug 19, 2019
```
通话次数
```
  1e4e41ea
16 Aug, 2019 1 commit
- 816 · 7c21be31
  chenyishuai@singsingenglish.com authored Aug 16, 2019
  
  7c21be31