Commit Graph

311 Commits

Author SHA1 Message Date
xuhe@fangjia.com 7f84dca862 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1
# Conflicts:
#	fangija-zsyf/views/house/houseDetail.html
2018-04-11 16:47:05 +08:00
xuhe@fangjia.com 5d821741ec aa 2018-04-11 16:45:31 +08:00
zongzhimin 8983c5d315 YOUFANG 房产行情 2018-04-11 16:43:18 +08:00
zongzhimin ffdd93facf YOUFANG 2018-04-11 15:53:59 +08:00
zongzhimin 67ad07dc56 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-11 15:47:08 +08:00
zongzhimin 899f3724e4 YOUFANG 房产行情 2018-04-11 15:47:00 +08:00
gaojuan 325517812a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-11 14:20:57 +08:00
gaojuan 9b37b4218e update 2018-04-11 14:20:42 +08:00
zongzhimin b7eb17e750 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1
# Conflicts:
#	fangija-zsyf/views/house/houseDetail.html
2018-04-11 14:18:10 +08:00
zongzhimin aecad0be45 add 2018-04-11 14:17:05 +08:00
zongzhimin f5c287ed0d YOUFANG1.0.3 房产行情 2018-04-11 14:02:38 +08:00
xuhe@fangjia.com 78ad6d55ab aa 2018-04-11 13:52:58 +08:00
尹吉欢 45eb0fad2d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-11 13:46:57 +08:00
尹吉欢 9d5c2db6a4 pv记录 2018-04-11 13:46:47 +08:00
xuhe@fangjia.com 42a23fe127 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-11 13:26:23 +08:00
xuhe@fangjia.com d55ad1ddc9 aa 2018-04-11 13:26:13 +08:00
xuhe@fangjia.com 74c811818d aa 2018-04-11 13:25:04 +08:00
gaojuan 23951480e7 update 2018-04-11 13:16:10 +08:00
gaojuan 1f62080800 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-11 12:57:40 +08:00
gaojuan 619989b97e update 2018-04-11 12:57:25 +08:00
raoyanhui cf3403cb14 控制我的房产登录没数据显示效果 2018-04-11 12:52:40 +08:00
raoyanhui 24f6195417 调整新评估页面 2018-04-11 12:32:46 +08:00
raoyanhui a8471489c8 提交评估页面 2018-04-11 12:31:33 +08:00
xuhe@fangjia.com c217fe217e Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-11 12:07:00 +08:00
xuhe@fangjia.com cb63302baa aa 2018-04-11 12:06:50 +08:00
raoyanhui 94d60536a9 Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-11 11:51:10 +08:00
raoyanhui 8871cf501c 修改参数 2018-04-11 11:50:59 +08:00
xuhe@fangjia.com bd2f189f60 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-11 11:43:57 +08:00
xuhe@fangjia.com aaf18ddc54 aa 2018-04-11 11:43:46 +08:00
zongzhimin e9d23b3c81 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 19:24:16 +08:00
zongzhimin 78f425f430 YOUFANG1.1 2018-04-10 19:24:08 +08:00
尹吉欢 d39ee4f70d Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 17:05:48 +08:00
尹吉欢 edbc8096e8 删除无效文件 2018-04-10 17:05:37 +08:00
raoyanhui 21ec4a4c8a Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 16:35:25 +08:00
raoyanhui 826c116d0d 提交房产管理 2018-04-10 16:34:55 +08:00
xuhe@fangjia.com 820d9c3c93 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-10 15:04:19 +08:00
xuhe@fangjia.com 472516c76b aa 2018-04-10 15:04:07 +08:00
尹吉欢 ed7357f65a Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 14:10:32 +08:00
尹吉欢 e6b94fe98b add 2018-04-10 14:10:23 +08:00
xuhe@fangjia.com 3d78c10ffb Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-10 13:54:51 +08:00
xuhe@fangjia.com 09feba8a75 aa 2018-04-10 13:54:38 +08:00
zongzhimin 141956e0ee YOUFANG1.1 2018-04-10 13:37:27 +08:00
zongzhimin 07758df471 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 13:36:28 +08:00
zongzhimin 51a6695277 YOUFANG1.1 2018-04-10 13:36:20 +08:00
raoyanhui 08b21e87fc Merge branch 'YOUFANGAPP1.1' of http://192.168.0.27/dev0/youfang-app into YOUFANGAPP1.1 2018-04-10 13:17:19 +08:00
raoyanhui 4234752e5b 提交个人中心 联调修改密码 2018-04-10 13:16:30 +08:00
raoyanhui cb5231eae1 调整我的房产管理排名部分, 暂时不显示 2018-04-10 13:11:45 +08:00
xuhe@fangjia.com 4a2668bee9 Merge branch 'YOUFANGAPP1.1' of 192.168.0.27:dev0/youfang-app into xh-youfangApp1.1 2018-04-10 13:04:47 +08:00
xuhe@fangjia.com 1db508bc5c aa 2018-04-10 13:04:37 +08:00
xuhe@fangjia.com bb7347c289 aa 2018-04-10 13:02:28 +08:00