Commit Graph

1901 Commits

Author SHA1 Message Date
zhaojixiang@fangjia.com 1b12bc12f6 匹配接口修改返回体 2023-08-07 16:47:30 +08:00
gaojuan 3a096abd98 10秒自动关闭 2023-08-03 18:25:47 +08:00
gaojuan 48ad452bc0 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
# Conflicts:
#	projects/fangjia-coresite/src/main/java/com/fangjia/coresite/controllers/SaleLeadsController.java
2023-08-03 11:53:43 +08:00
gaojuan d27c9c4d5e 首页添加广告 2023-08-03 11:51:28 +08:00
gaojuan b5ffe7095c Merge branch 'script_gj' into 'master'
update

See merge request !703
2023-08-02 18:19:56 +08:00
gaojuan d8cfe37a05 Merge branch 'script_gj' into 'master'
update

See merge request !702
2023-08-02 18:14:02 +08:00
gaojuan e28c2645f3 update 2023-08-02 18:13:50 +08:00
gaojuan f6704e3f27 update 2023-08-02 18:08:19 +08:00
gaojuan 59b4e0da3a Merge branch 'script_gj' into 'master'
建行导数据

See merge request !701
2023-08-02 14:54:56 +08:00
gaojuan b28093cc56 建行导数据 2023-08-02 14:49:12 +08:00
zhaojixiang@fangjia.com 0add3e2fb0 gj 2023-08-01 12:06:36 +08:00
gaojuan aad027d9ee 加ip 2023-08-01 11:53:58 +08:00
admin b2c4da2870 Merge branch 'open_gj' into 'master'
回退版本

See merge request !699
2023-07-31 20:05:04 +08:00
zhaojixiang@fangjia.com efef6bfa9a 新匹配接口上线 2023-07-31 20:02:07 +08:00
zhaojixiang@fangjia.com e63591f289 回退版本 2023-07-28 19:18:41 +08:00
admin 1b8ef57322 Merge branch 'open_gj' into 'master'
新匹配接口上线

See merge request !698
2023-07-28 18:03:41 +08:00
zhaojixiang@fangjia.com 412dbe46a6 新匹配接口上线 2023-07-28 17:58:53 +08:00
gaojuan 61bfb5ab96 Merge branch 'script_gj' into 'master'
福州价格脚本修改

See merge request !697
2023-07-28 17:57:14 +08:00
gaojuan efa3a24cbe Merge branch 'script_gj' into 'master'
后台:均价管理“楼栋系数管理”功能修改

See merge request !696
2023-07-27 18:37:52 +08:00
gaojuan 99f1c9f0fa Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-07-27 18:02:21 +08:00
gaojuan cdb97524db 修改别名,修改更新时间 2023-07-27 18:02:07 +08:00
gaojuan d50c970df4 Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-25 18:33:09 +08:00
gaojuan 3b41e8ce09 福州脚本修改 2023-07-25 18:32:49 +08:00
zhaojixiang@fangjia.com 7bbbc84961 后台:均价管理“楼栋系数管理”功能修改
https://zentao.fangjia.com/task-view-64.html
2023-07-25 11:21:41 +08:00
gaojuan c86d6baac7 福州价格脚本修改 2023-07-22 17:52:07 +08:00
gaojuan f39306ee0a Merge branch 'script_gj' into 'master'
福州脚本修改

See merge request !695
2023-07-21 18:36:46 +08:00
gaojuan f899f50de3 福州脚本修改 2023-07-21 18:32:06 +08:00
gaojuan 929d9d782b Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-07-21 18:16:07 +08:00
gaojuan d70506f4bd 为福州修改 2023-07-21 18:15:51 +08:00
gaojuan e5a0d1802b Merge branch 'open_bohai' into 'master'
防经纬度为空

See merge request !694
2023-07-21 11:54:57 +08:00
gaojuan 92fe6d0a43 防经纬度为空 2023-07-21 11:50:40 +08:00
gaojuan 716eabe3e9 update bug 2023-07-20 18:08:38 +08:00
gaojuan 411f4e81ff update 2023-07-20 17:56:06 +08:00
gaojuan 6e63244432 update 2023-07-20 17:37:06 +08:00
gaojuan b92d6eb9a9 update 2023-07-20 17:18:22 +08:00
gaojuan 7a52c6764c update 2023-07-20 16:09:17 +08:00
gaojuan 41d099fcb5 updadte 2023-07-19 22:32:11 +08:00
gaojuan 5d360349d2 update 2023-07-19 14:26:34 +08:00
gaojuan 4cb278a6d1 Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-19 14:06:54 +08:00
gaojuan 8e027cceac update 2023-07-19 14:06:35 +08:00
zhaojixiang@fangjia.com 3d40f2be78 校验小区名称,别名忽略无效的 2023-07-19 13:28:47 +08:00
zhaojixiang@fangjia.com 0b57dfa517 隐藏装修情况字段 2023-07-18 17:37:02 +08:00
zhaojixiang@fangjia.com 58d62ca674 写字楼后台修改 “城市统计”里面字段修改 2023-07-17 18:04:35 +08:00
admin c75b32c8cc Merge branch 'master' into 'script_gj'
# Conflicts:
#   projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl
2023-07-17 14:12:34 +08:00
zhaojixiang@fangjia.com 5f51a6f0d7 写字楼后台修改 2023-07-17 13:48:08 +08:00
zhaojixiang@fangjia.com 329bd3665e 小区库新增小区功能:不允许创建与别名完全一致的小区 2023-07-17 11:39:09 +08:00
gaojuan cae2eb9556 Merge branch 'script_gj' into 'master'
100-50

See merge request !683
2023-07-14 22:24:07 +08:00
gaojuan 834c271b7d 100-50 2023-07-14 22:19:33 +08:00
gaojuan f4c9a6d7cd Merge branch 'script_gj' into 'master'
update

See merge request !682
2023-07-14 18:47:13 +08:00
gaojuan 7d1ee1a59c update 2023-07-14 18:43:22 +08:00