Commit Graph

934 Commits

Author SHA1 Message Date
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
gaojuan c91457acc9 添加log 2021-11-20 19:06:25 +08:00
gaojuan 5dd98061e7 update 2021-11-20 18:58:35 +08:00
gaojuan e7572f9627 Merge branch 'open_gj' of http://gitlab.fangjia.com/dev0/main into open_gj 2021-11-20 18:24:26 +08:00
gaojuan be5497a579 出具正式报告 2021-11-20 18:23:48 +08:00
gaojuan d12ab318ae Merge branch 'open_gj' into 'master'
添加log

See merge request !198
2021-11-20 18:09:18 +08:00
gaojuan 410dfd27b2 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into script_gj
# Conflicts:
#	projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/QinLin.groovy
#	projects/fangjia-script/src/main/groovy/com/fangjia/script/wenyan/temp/SiChuanJingCheng.groovy
2021-11-20 18:03:24 +08:00
gaojuan 375e3ea49c Merge branch 'script_gj' into 'master'
Script gj

See merge request !196
2021-11-20 18:01:42 +08:00
gaojuan 710187e4bd 修改 2021-11-20 17:57:58 +08:00
gaojuan 88bbfb9ba0 update 2021-11-20 17:35:06 +08:00
gaojuan 399e90b4dd update 2021-11-20 17:29:44 +08:00
gaojuan e96227ac3c Merge branch 'open_gj' into 'master'
Open gj

See merge request !197
2021-11-20 17:27:27 +08:00
沈健 5562a2bcb2 隔离高德key 2021-11-19 13:36:57 +08:00
沈健 4b0ad83014 修复合并后代码丢失 2021-11-18 10:38:05 +08:00
沈健 36632c28ff 高德搜索key单独用 2021-11-18 10:11:13 +08:00
gaojuan 30def16efa Merge branch 'open_gj' into 'master'
Open gj

See merge request !192
2021-11-18 09:48:35 +08:00
gaojuan 3b47ee8ea2 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2021-11-17 15:09:09 +08:00
gaojuan 13dd51563f 添加友达培训 2021-11-17 15:08:50 +08:00
沈健 78ec917715 高德ID反查 2021-11-17 13:40:13 +08:00
gaojuan 59fc0b0fee bug 修正 2021-11-16 18:25:39 +08:00
gaojuan d72d230d31 log 2021-11-16 12:49:15 +08:00
gaojuan 106fa1195c 评估放渤海地址搜索后面 2021-11-16 12:01:22 +08:00
gaojuan 9739a69e1e 添加log 2021-11-16 10:09:27 +08:00
gaojuan 7dda6e88bc 添加日志 2021-11-16 09:54:50 +08:00
gaojuan 0b836a71fe 测试接口 2021-11-15 21:02:50 +08:00
gaojuan 1a8a690d88 手机选择图片问题 2021-11-15 19:34:01 +08:00
gaojuan f336829a0d Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into open_gj
# Conflicts:
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java
2021-11-15 19:08:41 +08:00
gaojuan 50de81d7ce Merge branch 'open_gj' of http://gitlab.fangjia.com/dev0/main into open_gj 2021-11-15 19:02:22 +08:00