Commits · f80c8f824dc3ee19c90fe4d756c9758c698fa333 · hujun / tl_estate

14 Dec, 2018 2 commits
- 计算业绩总计即应分佣金根据分佣ID去重 · f80c8f82
  zhuwei authored Dec 14, 2018
  
  f80c8f82
- 日志记录 · 52a9bbed
  hujun authored Dec 14, 2018
```
# Conflicts:
#	application/index/controller/Finance.php
```
  52a9bbed
13 Dec, 2018 3 commits
- 商铺日志修改 · ce0bc958
  agping authored Dec 13, 2018
  
  ce0bc958
- update_time · 000ddf19
  hujun authored Dec 13, 2018
  
  000ddf19
- 字段调整 · 5187a03e
  hujun authored Dec 13, 2018
  
  5187a03e
12 Dec, 2018 10 commits
- 应收佣金 · db87ca57
  hujun authored Dec 12, 2018
  
  db87ca57
- 应收佣金 · bce3dbd9
  hujun authored Dec 12, 2018
  
  bce3dbd9
- 分佣提成明细表-状态判断 · f46d5ad1
  hujun authored Dec 12, 2018
```
1
```
  f46d5ad1
- 实收汇总优化-税费 · 4cff6544
  hujun authored Dec 12, 2018
  
  4cff6544
- 实收汇总优化 · b7003aca
  hujun authored Dec 12, 2018
  
  b7003aca
- 1 · 196fca6f
  agping authored Dec 12, 2018
  
  196fca6f
- 实收汇总 · 0ffc2419
  agping authored Dec 12, 2018
  
  0ffc2419
- 截止确认分佣时间 · 494fc535
  hujun authored Dec 12, 2018
  
  494fc535
- bug · 5db0775e
  zw authored Dec 12, 2018
  
  5db0775e
- bug · 3e1a02d9
  zw authored Dec 12, 2018
  
  3e1a02d9
10 Dec, 2018 12 commits
- bug · 3423498d
  zw authored Dec 10, 2018
  
  3423498d
- 排除空设备 · 359ca1c2
  hujun authored Dec 10, 2018
  
  359ca1c2
- 经纪人和客户推送 · 18bdcf61
  hujun authored Dec 10, 2018
  
  18bdcf61
- bug · 18ab9c66
  zw authored Dec 10, 2018
  
  18ab9c66
- bug · bf18f815
  zw authored Dec 10, 2018
  
  bf18f815
- 打包 · 05b0bdc4
  agping authored Dec 10, 2018
  
  05b0bdc4
- 样式修改2 · ef497448
  xishifeng authored Dec 10, 2018
  
  ef497448
- Merge branch '1130-v3.0.1' into test · 0f922c7c
  zw authored Dec 10, 2018
  
  0f922c7c
- 打包 · e0e9bd4c
  agping authored Dec 10, 2018
  
  e0e9bd4c
- Merge remote-tracking branch 'origin/test' into test · 92b11951
  zw authored Dec 10, 2018
  
  92b11951
- Merge branch '1130-v3.0.1' into test · 037cdd07
  zw authored Dec 10, 2018
```
# Conflicts:
#	application/api/service/PushClientService.php
```
  037cdd07
- 样式修改 · 05fc3d33
  xishifeng authored Dec 10, 2018
  
  05fc3d33
07 Dec, 2018 9 commits
- 获取站点 · c8c05c27
  hujun authored Dec 07, 2018
  
  c8c05c27
- 获取站点 · 174ae515
  hujun authored Dec 07, 2018
  
  174ae515
- 推送格式修改 · 60d06aee
  hujun authored Dec 07, 2018
  
  60d06aee
- 聊天注册2 · 5a3009c7
  hujun authored Dec 07, 2018
  
  5a3009c7
- 聊天注册 · e34cce04
  hujun authored Dec 07, 2018
  
  e34cce04
- 编辑修改经纪人手机号返回提示语 · 3da47d3f
  hujun authored Dec 07, 2018
  
  3da47d3f
- 编辑修改经纪人手机号返回提示语 · f19fe52b
  hujun authored Dec 07, 2018
  
  f19fe52b
- 评价完同步去除推送状态 · aa6fcd4f
  hujun authored Dec 07, 2018
  
  aa6fcd4f
- 日报周报人数计算，只算状态正常的经纪人 · 877d7fce
  zhuwei authored Dec 07, 2018
  
  877d7fce
06 Dec, 2018 4 commits
- 是否评价检测 · 9987a87b
  hujun authored Dec 06, 2018
  
  9987a87b
- url · 4d401290
  hujun authored Dec 06, 2018
  
  4d401290
- Merge remote-tracking branch 'origin/test' into test · d83dd879
  zw authored Dec 06, 2018
  
  d83dd879
- bug · 63e6cfb1
  zw authored Dec 06, 2018
  
  63e6cfb1