Commits · 826e7db33af9072f8fbe6ab5ffbf2bee234720bc · hujun / tl_estate

20 Dec, 2018 39 commits
- order_id · 826e7db3
  hujun authored Dec 20, 2018
  
  826e7db3
- bargain_id · d721ca28
  hujun authored Dec 20, 2018
  
  d721ca28
- 修改 · 0e9f0e60
  agping authored Dec 20, 2018
  
  0e9f0e60
- 公告标签 · 5c869f05
  zhuwei authored Dec 20, 2018
  
  5c869f05
- isset · b97ab206
  hujun authored Dec 20, 2018
  
  b97ab206
- 修改housenumber · 99496dde
  duxinyuan authored Dec 20, 2018
  
  99496dde
- 带看id · 873abb77
  duxinyuan authored Dec 20, 2018
  
  873abb77
- 带看id · 3b85ab27
  duxinyuan authored Dec 20, 2018
  
  3b85ab27
- 下载页新增 · 91ff8dca
  agping authored Dec 20, 2018
  
  91ff8dca
- 下载页 · 3f360130
  agping authored Dec 20, 2018
  
  3f360130
- 下载页 · af420c4c
  agping authored Dec 20, 2018
  
  af420c4c
- 去除验证 · a96ffabb
  hujun authored Dec 20, 2018
  
  a96ffabb
- Merge branch '1210-v3.0.2' into test · 48351b68
  zw authored Dec 20, 2018
```
# Conflicts:
#	application/index/controller/Finance.php
#	application/index/controller/ImageDepot.php
#	public/app/dist/index.html
#	public/app/dist/static/css/app.18f66e05aeedf4028dbf86453eab6b23.css
#	public/app/dist/static/css/app.370df8a02c6ffd39798798a503aab7d5.css
#	public/app/dist/static/css/app.a73181a8689d77665f3ecd7635761082.css
#	public/appnew/src/components/shop/redPackMask.vue
#	public/appnew/src/components/shop/shopList.vue
```
  48351b68
- shop_id · f69e0d32
  duxinyuan authored Dec 20, 2018
  
  f69e0d32
- 实收汇总总计 · 967a3acc
  agping authored Dec 20, 2018
  
  967a3acc
- 调整id · 17207f58
  hujun authored Dec 20, 2018
  
  17207f58
- 修改时间轴 · d773e158
  duxinyuan authored Dec 20, 2018
  
  d773e158
- Merge branch '1210-v3.0.2' into test · bdbe9dce
  zw authored Dec 20, 2018
  
  bdbe9dce
- 实收金额汇总 · 5fd91b19
  hujun authored Dec 20, 2018
```
# Conflicts:
#	application/index/controller/Finance.php
```
  5fd91b19
- 修改带看id属性 · ba7b8a45
  duxinyuan authored Dec 20, 2018
  
  ba7b8a45
- 实收金额汇总 · b9f40450
  hujun authored Dec 20, 2018
  
  b9f40450
- Merge branch '1210-v3.0.2' into test · ce23a501
  zw authored Dec 20, 2018
```
# Conflicts:
#	application/index/controller/Finance.php
#	application/index/controller/ImageDepot.php
#	public/app/dist/index.html
#	public/app/dist/static/css/app.18f66e05aeedf4028dbf86453eab6b23.css
#	public/app/dist/static/css/app.370df8a02c6ffd39798798a503aab7d5.css
#	public/app/dist/static/css/app.a73181a8689d77665f3ecd7635761082.css
#	public/appnew/src/components/shop/redPackMask.vue
#	public/appnew/src/components/shop/shopList.vue
```
  ce23a501
- 调整----商铺号 · e33e067b
  duxinyuan authored Dec 20, 2018
  
  e33e067b
- 修改带看id备注 · af672367
  duxinyuan authored Dec 20, 2018
  
  af672367
- 1 · 68928267
  zhuwei authored Dec 20, 2018
  
  68928267
- 业态 · 91d7b92c
  hujun authored Dec 20, 2018
  
  91d7b92c
- 增加业态/品牌模块 · 2c4fda51
  duxinyuan authored Dec 20, 2018
  
  2c4fda51
- 修改中介费下隐藏的模块 · 6aad6346
  duxinyuan authored Dec 20, 2018
  
  6aad6346
- 修改时间轴收款 · 1fd8d1ad
  duxinyuan authored Dec 20, 2018
  
  1fd8d1ad
- 撤销成功报告优化 · 062ac854
  hujun authored Dec 20, 2018
  
  062ac854
- 修改调整商铺ID · 995a8ebf
  duxinyuan authored Dec 20, 2018
  
  995a8ebf
- 代码整理,修改统计功能 · 75200f79
  duxinyuan authored Dec 20, 2018
  
  75200f79
- 财务优化 · 00a58a73
  agping authored Dec 20, 2018
  
  00a58a73
- 新增字段 · cb4c0702
  hujun authored Dec 20, 2018
  
  cb4c0702
- 修改类型设置 · 7db9105d
  duxinyuan authored Dec 20, 2018
  
  7db9105d
- 关闭input的自动记忆功能(调整哈偶带看id和成交报告id) · 75deba18
  duxinyuan authored Dec 20, 2018
  
  75deba18
- 1 · 7021bd58
  duxinyuan authored Dec 20, 2018
  
  7021bd58
- real_money · f8de367d
  hujun authored Dec 20, 2018
  
  f8de367d
- 修改 · 6a15d334
  agping authored Dec 20, 2018
  
  6a15d334
19 Dec, 2018 1 commit
- 1 · 9904a059
  duxinyuan authored Dec 19, 2018
  
  9904a059