Commit Graph

1911 Commits

Author SHA1 Message Date
gaojuan c7b88057c8 update 2021-12-24 18:18:07 +08:00
gaojuan 0fe780b3af update 2021-12-24 18:12:21 +08:00
gaojuan 516ea36f15 update 2021-12-24 15:52:16 +08:00
gaojuan baf4c7c361 update 2021-12-20 18:00:21 +08:00
gaojuan 1fff834450 Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2021-12-20 17:17:22 +08:00
gaojuan f56882ae4b update 2021-12-20 17:16:53 +08:00
gaojuan 930a54b49c update 2021-12-20 17:15:27 +08:00
沈健 d5da3bf5d1 获取excel小区最新poi信息 2021-12-16 17:04:17 +08:00
沈健 d8e8bb6885 重新跑小区高德最新信息 2021-12-16 15:55:05 +08:00
gaojuan 4b1f9a6ab3 update 2021-12-10 15:22:17 +08:00
gaojuan 37dcae918a 查es修改 2021-12-10 13:35:32 +08:00
gaojuan 46766341dc 编码 2021-12-10 12:01:46 +08:00
沈健 932370ed32 Merge remote-tracking branch 'origin/script_gj' into script_gj 2021-12-10 11:59:43 +08:00
沈健 e7b9c77d81 乱码 2021-12-10 11:58:57 +08:00
gaojuan fc92cb2753 update 2021-12-10 11:54:46 +08:00
gaojuan ff2dae36e6 房源修改 2021-12-10 11:46:17 +08:00
沈健 1ddc862ee5 Merge branch 'script_develop' into script_gj
# Conflicts:
#	projects/fangjia-script/src/main/groovy/com/fangjia/script/util/ExcelUtils.groovy
2021-12-10 10:51:52 +08:00
gaojuan c9fab3e535 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into script_gj 2021-12-10 10:42:20 +08:00
gaojuan 0ccdf95f3d update 2021-12-10 10:42:11 +08:00
gaojuan 1046832492 面积去除地下面积部分
修改bug
2021-12-09 18:02:59 +08:00
gaojuan f29f4f4675 Merge branch 'open_gj' into 'master'
面积去除地下面积部分

See merge request !213
2021-12-09 17:04:32 +08:00
gaojuan 8a2362605d update 2021-12-09 16:00:42 +08:00
gaojuan 8ecde2128e Merge branch 'script_gj' into 'master'
update

See merge request !212
2021-12-09 15:02:29 +08:00
gaojuan db700e5f48 线上评估服务器错误及公众号,渤海帐号问题 2021-12-03 16:40:11 +08:00
gaojuan 9c2c691e98 Merge branch 'open_gj' into 'master'
线上评估服务器错误及公众号,渤海帐号问题

See merge request !211
2021-12-03 15:42:51 +08:00
gaojuan 6bfd7d7aae update 2021-12-03 11:37:10 +08:00
gaojuan 8ee136b13c Merge branch 'open_gj' into 'master'
update

See merge request !210
2021-12-03 10:39:12 +08:00
gaojuan 8b906528f1 update 2021-12-02 12:34:21 +08:00
gaojuan 3aea39ebc8 Merge branch 'open_gj' into 'master'
update

See merge request !209
2021-12-02 11:36:55 +08:00
gaojuan c8e022dc90 还原登录 2021-12-02 11:31:03 +08:00
gaojuan 0a5d323cd7 渤海及公众号登录修改
渤海无数据返回bug
2021-12-02 10:59:37 +08:00
gaojuan 2d6256f5ab Merge branch 'open_gj' into 'master'
还原登录

See merge request !208
2021-12-02 10:35:01 +08:00
gaojuan b05fcf1696 Merge branch 'open_gj' into 'master'
渤海及公众号登录修改

See merge request !207
2021-12-02 10:05:51 +08:00
gaojuan 89b5c6d85a 默认登录 2021-12-01 16:55:46 +08:00
gaojuan 05bdb229d2 Merge branch 'open_gj' into 'master'
默认登录

See merge request !206
2021-12-01 15:58:12 +08:00
gaojuan fc280bd7ab Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2021-12-01 10:31:19 +08:00
gaojuan 04df6e25a2 显示城市楼盘总数 2021-12-01 10:31:02 +08:00
gaojuan 923026a284 去掉多余的 2021-11-30 11:07:16 +08:00
gaojuan 4ea19eb1bb 多个查询结果及询价单传给渤海 2021-11-29 17:08:56 +08:00
gaojuan 4b495f1c52 update bug 2021-11-25 09:44:18 +08:00
gaojuan 1f73bca57f 多余引用 2021-11-24 14:00:17 +08:00
gaojuan ef32fcd53a Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into open_gj 2021-11-24 13:58:12 +08:00
gaojuan 9486566588 update 2021-11-24 13:58:01 +08:00
gaojuan 8941f0bb5d update 2021-11-22 19:15:34 +08:00
gaojuan 148d974e39 update 2021-11-22 18:33:01 +08:00
gaojuan 9e59951bb8 Merge branch 'script_gj' into 'master'
update

See merge request !200
2021-11-22 18:18:48 +08:00
gaojuan dbf37d4d46 Merge branch 'script_gj' into 'master'
update

See merge request !199
2021-11-22 17:36:26 +08:00
admin 0296860d13 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2021-11-20 23:44:54 +08:00
admin 80b1c7f3c4 fix bug 2021-11-20 23:44:39 +08:00
admin 820fde272c fix bug 2021-11-20 23:43:39 +08:00