Commits · a88fe0c4e568764c8f25ddf9c8f83e07bdf34c73 · hujun / tl_estate

02 Apr, 2018 6 commits
- 业绩暂存 · a88fe0c4
  xishifeng authored Apr 02, 2018
  
  a88fe0c4
- 新增经纪人手机后6位作为初始密码 · c5cd504b
  hujun authored Apr 02, 2018
  
  c5cd504b
- admin去除权限判断 · e3797c03
  hujun authored Apr 02, 2018
  
  e3797c03
- Merge branch 'test-hujun1.15' into test · 83bc5cc7
  clone authored Apr 02, 2018
  
  83bc5cc7
- app版本管理 · 951921a4
  zw authored Apr 02, 2018
  
  951921a4
- Merge branch 'test-hujun1.15' into test · 93be1855
  clone authored Apr 02, 2018
```
# Conflicts:
#	application/api/controller/Member.php
```
  93be1855
01 Apr, 2018 19 commits
- 群推 · 259b29ea
  hujun authored Apr 01, 2018
  
  259b29ea
- 业绩周报日报 · 5f6dd1aa
  xishifeng authored Apr 01, 2018
  
  5f6dd1aa
- 保存周报日报四个字段-搜索条件修改 · 40847a6b
  hujun authored Apr 01, 2018
  
  40847a6b
- bug · ae5d653d
  zw authored Apr 01, 2018
  
  ae5d653d
- bug · 93a1ccf7
  zw authored Apr 01, 2018
  
  93a1ccf7
- 注释 · 5322c86b
  zw authored Apr 01, 2018
  
  5322c86b
- 注释 · 3f74044d
  zw authored Apr 01, 2018
  
  3f74044d
- 版本和日报周报 · f2792ed9
  zw authored Apr 01, 2018
  
  f2792ed9
- 修改保存周报日报四个字段保持方式 · 7a99e1ee
  hujun authored Apr 01, 2018
  
  7a99e1ee
- 后台按钮权限检测 · dcec105a
  hujun authored Apr 01, 2018
  
  dcec105a
- 聊天经纪人修改 · 37fe5f1d
  zw authored Apr 01, 2018
  
  37fe5f1d
- 获取周报或者日报-字段修改 · e11cb2ea
  hujun authored Apr 01, 2018
  
  e11cb2ea
- 修改生成日报和周报图片开始和结束时间 · d69093e0
  hujun authored Apr 01, 2018
  
  d69093e0
- 修改获取周报或者日报搜索条件 · 629437f8
  hujun authored Apr 01, 2018
  
  629437f8
- 修改 · 1269f719
  hujun authored Apr 01, 2018
  
  1269f719
- 修改获取周报或者日报返回格式 · 663f8858
  hujun authored Apr 01, 2018
  
  663f8858
- 日报周报 · 71a8c772
  zw authored Apr 01, 2018
  
  71a8c772
- 跨域 · f2a7055c
  hujun authored Apr 01, 2018
  
  f2a7055c
- 取AuthToken agentId · 14b59308
  hujun authored Apr 01, 2018
  
  14b59308
30 Mar, 2018 10 commits
- 新增客户注释邀请人字段 · 59e7055a
  hujun authored Mar 30, 2018
  
  59e7055a
- 取消注释 · f9c87498
  hujun authored Mar 30, 2018
  
  f9c87498
- 修改邀请注册，客方保留2级 · 8fdd6b22
  hujun authored Mar 28, 2018
  
  8fdd6b22
- 周报日报截图 · e16fc78e
  xishifeng authored Mar 30, 2018
  
  e16fc78e
- 邀请注册路由 · 9f626ef4
  hujun authored Mar 30, 2018
  
  9f626ef4
- 修改邀请注册判断 · 3954b770
  hujun authored Mar 30, 2018
  
  3954b770
- 生成二维码 · 61352057
  hujun authored Mar 30, 2018
  
  61352057
- 修改短信发送 · 08877b13
  hujun authored Mar 30, 2018
  
  08877b13
- 解决冲突 · 21708f90
  hujun authored Mar 30, 2018
  
  21708f90
- 经纪人邀请记录 · 7ab5442b
  hujun authored Mar 30, 2018
  
  7ab5442b
29 Mar, 2018 5 commits
- 周报暂存0329 · a7249a49
  xishifeng authored Mar 29, 2018
  
  a7249a49
- 跨域 · 90d49678
  hujun authored Mar 29, 2018
  
  90d49678
- all_user · e6a76b73
  hujun authored Mar 29, 2018
  
  e6a76b73
- 全部客户路由 · a233dbf6
  hujun authored Mar 29, 2018
  
  a233dbf6
- Merge branch 'test' into test-hujun1.15 · 6d0eda3c
  hujun authored Mar 29, 2018
```
# Conflicts:
#	application/api/controller/Member.php
#	application/model/Users.php
```
  6d0eda3c