Commits · b26b321a0c801b5f8e9deacf099d3b853b429492 · new-sing / admin-base

28 Aug, 2019 28 commits
- 发布代码修复各种bug、新增回访回显功能 · b26b321a
  赵茹林 authored Aug 28, 2019
  
  b26b321a
- Merge branch 'pre' of git.singsingenglish.com:new-sing/admin into pre · 8940a2f1
  赵茹林 authored Aug 28, 2019
  
  8940a2f1
- Merge branch 'dev' into pre · 4a998eeb
  赵茹林 authored Aug 28, 2019
  
  4a998eeb
- Merge branches 'dev' and 'dev' of git.singsingenglish.com:new-sing/admin into dev · f309e1ab
  赵茹林 authored Aug 28, 2019
  
  f309e1ab
- 回访信息新增意向度、下次回访回显功能 · 8be47f0d
  赵茹林 authored Aug 28, 2019
  
  8be47f0d
- 销售管理搜索修改 · fbb2c62d
  IvyXia123 authored Aug 28, 2019
  
  fbb2c62d
- Merge branch 'dev' into pre · 23051527
  IvyXia123 authored Aug 28, 2019
  
  23051527
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev · c7421a87
  IvyXia123 authored Aug 28, 2019
  
  c7421a87
- 销售级别修改 · 64fa0a4a
  IvyXia123 authored Aug 28, 2019
  
  64fa0a4a
- Merge branch 'dev' into pre · cca2d31e
  赵茹林 authored Aug 28, 2019
  
  cca2d31e
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · 83b530ea
  赵茹林 authored Aug 28, 2019
  
  83b530ea
- 回访信息修复更新手机号、微信号后界面没有更新显示的问题，最后更新时间不显示/不更新显示的问题 · 7abb7542
  赵茹林 authored Aug 28, 2019
  
  7abb7542
- 待回访修改 · b1c11652
  IvyXia123 authored Aug 28, 2019
  
  b1c11652
- Merge branch 'dev' into pre · 002a762d
  IvyXia123 authored Aug 28, 2019
  
  002a762d
- 待回访修改 · e67734e6
  IvyXia123 authored Aug 28, 2019
  
  e67734e6
- 待回访修改 · 8b58a184
  IvyXia123 authored Aug 28, 2019
  
  8b58a184
- 待回访修改 · 84215b5e
  IvyXia123 authored Aug 28, 2019
  
  84215b5e
- 回访信息修复权限问题 · a6b45465
  赵茹林 authored Aug 28, 2019
  
  a6b45465
- 客户管理时间修改 · ab965617
  IvyXia123 authored Aug 28, 2019
  
  ab965617
- Merge branch 'dev' into pre · 56098eb7
  IvyXia123 authored Aug 28, 2019
  
  56098eb7
- min提交 · 29cbfa44
  IvyXia123 authored Aug 28, 2019
  
  29cbfa44
- 时间更新 · 854a330a
  IvyXia123 authored Aug 28, 2019
  
  854a330a
- Merge branch 'dev' into pre · 0c1831fa
  IvyXia123 authored Aug 28, 2019
  
  0c1831fa
- no message · 78eaced8
  IvyXia123 authored Aug 28, 2019
  
  78eaced8
- 佣金优化输入框后增加 % 展示 · 369f6a74
  赵茹林 authored Aug 28, 2019
  
  369f6a74
- 销售级别二次提交 · 1d86842b
  IvyXia123 authored Aug 28, 2019
  
  1d86842b
- Merge branch 'dev' into pre · ad1fa9f9
  IvyXia123 authored Aug 28, 2019
  
  ad1fa9f9
- 客户管理新增信息 · 088df43a
  IvyXia123 authored Aug 28, 2019
  
  088df43a
27 Aug, 2019 12 commits
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/admin into pre · 71f7e742
  IvyXia123 authored Aug 27, 2019
```
# Conflicts:
#	dist/index.html
```
  71f7e742
- 销售级别 · 0eee84f6
  IvyXia123 authored Aug 27, 2019
  
  0eee84f6
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev · 9ab1b540
  IvyXia123 authored Aug 27, 2019
  
  9ab1b540
- 销售级别 · c530f2cb
  IvyXia123 authored Aug 27, 2019
  
  c530f2cb
- 更新代码标签修复无法添加标签的问题 · b1d77355
  赵茹林 authored Aug 27, 2019
  
  b1d77355
- Merge branch 'dev' into pre · 0ff30a28
  赵茹林 authored Aug 27, 2019
  
  0ff30a28
- 标签修复无法添加标签的问题 · 36ec1bac
  赵茹林 authored Aug 27, 2019
  
  36ec1bac
- 回访修复标签样式 · 54e436a9
  赵茹林 authored Aug 27, 2019
  
  54e436a9
- update · 0f7ec509
  赵茹林 authored Aug 27, 2019
  
  0f7ec509
- 客户管理bug 销售级别 · 49132fee
  IvyXia123 authored Aug 27, 2019
  
  49132fee
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/admin into pre · 53ff3840
  IvyXia123 authored Aug 27, 2019
```
# Conflicts:
#	dist/index.html
#	src/util/menuList.js
#	src/util/wordbook.js
```
  53ff3840
- 客户管理bug 销售级别 · 0c8f1479
  IvyXia123 authored Aug 27, 2019
  
  0c8f1479