Commits · 0a288ebe06dd448062f4bb6e7b352183786f7bd9 · hujun / tl_estate

30 Jun, 2018 1 commit
- 批量修改盘方 · 0a288ebe
  hujun authored Jun 30, 2018
  
  0a288ebe
29 Jun, 2018 1 commit
- bug · 5cc5fc0f
  clone authored Jun 29, 2018
  
  5cc5fc0f
28 Jun, 2018 38 commits
- bug · 3e914fa7
  clone authored Jun 28, 2018
  
  3e914fa7
- 喜报 · 28417f2f
  hujun authored Jun 28, 2018
  
  28417f2f
- 喜报 · d4b86372
  hujun authored Jun 28, 2018
  
  d4b86372
- 喜报 · e525cd31
  hujun authored Jun 28, 2018
  
  e525cd31
- Merge remote-tracking branch 'origin/test' into test · cfe8f828
  hujun authored Jun 28, 2018
  
  cfe8f828
- 喜报 · fa446863
  hujun authored Jun 28, 2018
  
  fa446863
- bug · 3e1531f5
  clone authored Jun 28, 2018
  
  3e1531f5
- 日志未定义数组元素 · 82bf407f
  hujun authored Jun 28, 2018
  
  82bf407f
- Merge remote-tracking branch 'origin/test' into test · d884fb9e
  hujun authored Jun 28, 2018
  
  d884fb9e
- 日志未定义数组元素 · a9f764f3
  hujun authored Jun 28, 2018
  
  a9f764f3
- bug · e8638aba
  clone authored Jun 28, 2018
  
  e8638aba
- bug · 9d14db55
  clone authored Jun 28, 2018
  
  9d14db55
- bug · 0612de43
  clone authored Jun 28, 2018
  
  0612de43
- 去除重复方法 · 816b101f
  hujun authored Jun 28, 2018
  
  816b101f
- Merge remote-tracking branch 'origin/test' into test · 18051904
  hujun authored Jun 28, 2018
  
  18051904
- wx0604 覆盖test 隐私号码 · 75133426
  hujun authored Jun 28, 2018
  
  75133426
- 微信授权页面 · 67a4e990
  clone authored Jun 28, 2018
  
  67a4e990
- Merge remote-tracking branch 'origin/test' into test · 42bc8f34
  hujun authored Jun 28, 2018
  
  42bc8f34
- 111 · 15196051
  hujun authored Jun 28, 2018
  
  15196051
- 微信授权文件 · c7739430
  clone authored Jun 28, 2018
  
  c7739430
- bug · 878f7056
  clone authored Jun 28, 2018
  
  878f7056
- Merge remote-tracking branch 'origin/test' into test · 2b3bddbe
  hujun authored Jun 28, 2018
```
# Conflicts:
#	application/api_broker/controller/CellPhone.php
```
  2b3bddbe
- 111 · a5f2927d
  hujun authored Jun 28, 2018
  
  a5f2927d
- bug · 3ae87479
  clone authored Jun 28, 2018
  
  3ae87479
- Merge branch 'wx0604' into test · a8392cd9
  clone authored Jun 28, 2018
```
# Conflicts:
#	application/api_broker/controller/CellPhone.php
#	application/api_broker/controller/Shop.php
#	application/index/controller/Agent.php
#	application/index/controller/CellPhone.php
#	application/index/controller/Finance.php
#	application/index/controller/Member.php
#	application/index/view/member/users_list.html
#	application/model/BindingPhone.php
#	application/model/GHouses.php
#	application/model/OBargainModel.php
#	application/route.php
#	application/task/controller/PrivacyNumber.php
#	public/resource/js/user.js
```
  a8392cd9
- Merge branch 'wx0604' of https://gitee.com/zwyjjc/tl_estate into wx0604 · eb13437a
  clone authored Jun 28, 2018
  
  eb13437a
- bug · 40d26627
  clone authored Jun 28, 2018
  
  40d26627
- Merge remote-tracking branch 'origin/wx0604' into wx0604 · 903f3738
  hujun authored Jun 28, 2018
  
  903f3738
- 开票税费比例记录日志 · dd2caf86
  hujun authored Jun 28, 2018
  
  dd2caf86
- 样式调整 · 816d8c74
  xishifeng authored Jun 28, 2018
  
  816d8c74
- Merge remote-tracking branch 'origin/wx0604' into wx0604 · de863285
  hujun authored Jun 28, 2018
  
  de863285
- 去除公告注释 · ea2a27d1
  hujun authored Jun 28, 2018
  
  ea2a27d1
- 执行记录修改 · 9c8543a6
  xishifeng authored Jun 28, 2018
  
  9c8543a6
- 客户拨打经纪人手机号1天不重复计入拨打数量 · 23f97bbe
  hujun authored Jun 28, 2018
  
  23f97bbe
- Merge remote-tracking branch 'origin/wx0604' into wx0604 · d373bd84
  hujun authored Jun 28, 2018
  
  d373bd84
- c端经纪人主页接口修改 · 05b69bf3
  hujun authored Jun 28, 2018
  
  05b69bf3
- bug · a6915805
  clone authored Jun 28, 2018
  
  a6915805
- bug · 31520849
  clone authored Jun 28, 2018
  
  31520849