Commit Graph

548 Commits

Author SHA1 Message Date
admin 4f01c286b5 k8s 2021-11-20 22:27:32 +08:00
admin 6005c5da3e 修改k8s配置文件 2021-11-20 22:16:59 +08:00
admin 6da193c1e0 添加友达k8s文件 2021-11-20 22:09:45 +08:00
admin 054c20ba01 修改k8s配置 2021-11-20 21:34:27 +08:00
admin e411a92903 添加友达k8s配置文件 2021-11-20 21:25:53 +08:00
gaojuan d12ab318ae Merge branch 'open_gj' into 'master'
添加log

See merge request !198
2021-11-20 18:09:18 +08:00
gaojuan c91457acc9 添加log 2021-11-20 19:06:25 +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 375e3ea49c Merge branch 'script_gj' into 'master'
Script gj

See merge request !196
2021-11-20 18:01:42 +08:00
gaojuan 5dd98061e7 update 2021-11-20 18:58:35 +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 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
沈健 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
gaojuan 59fc0b0fee bug 修正 2021-11-16 18:25:39 +08:00
gaojuan 77def037cc Merge branch 'open_gj' into 'master'
bug 修正

See merge request !191
2021-11-16 17:28:51 +08:00
gaojuan d72d230d31 log 2021-11-16 12:49:15 +08:00
gaojuan 771ea51833 Merge branch 'open_gj' into 'master'
log

See merge request !190
2021-11-16 12:03:31 +08:00
gaojuan 106fa1195c 评估放渤海地址搜索后面 2021-11-16 12:01:22 +08:00
gaojuan 1dba797e8d Merge branch 'open_gj' into 'master'
评估放渤海地址搜索后面

See merge request !189
2021-11-16 11:04:42 +08:00
gaojuan 9739a69e1e 添加log 2021-11-16 10:09:27 +08:00
gaojuan 7dda6e88bc 添加日志 2021-11-16 09:54:50 +08:00
gaojuan 11c5381877 Merge branch 'open_gj' into 'master'
添加log

See merge request !188
2021-11-16 09:12:43 +08:00
gaojuan d8ac136496 Merge branch 'open_gj' into 'master'
添加日志

See merge request !187
2021-11-16 08:59:27 +08:00
gaojuan 0b836a71fe 测试接口 2021-11-15 21:02:50 +08:00
gaojuan dab962674d Merge branch 'open_gj' into 'master'
测试接口

See merge request !186
2021-11-15 20:06:17 +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
gaojuan e2b9754a5b 图片上传 2021-11-15 19:01:59 +08:00
gaojuan ffcf46bec1 Merge branch 'open_gj' into 'master'
手机选择图片问题

See merge request !185
2021-11-15 18:37:20 +08:00
gaojuan ae3acddd55 Merge branch 'open_gj' into 'master'
风险识别新增异常兜底返回

See merge request !184
2021-11-15 18:12:27 +08:00
沈健 cdc8cf4eae 新增异常兜底返回 2021-11-12 10:06:18 +08:00
gaojuan d991cea59c Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2021-11-11 12:01:01 +08:00
gaojuan c275971c7e update 2021-11-11 12:00:44 +08:00
gaojuan d8b38f053f Merge branch 'open_gj' of http://gitlab.fangjia.com/dev0/main into open_gj 2021-11-10 11:57:06 +08:00
gaojuan f2bcbd4ccd bug update 2021-11-10 11:56:22 +08:00
gaojuan f7f45e35c1 Merge branch 'open_gj' into 'master'
Open gj

See merge request !183
2021-11-10 11:00:55 +08:00
gaojuan 47fcaeb1b3 Merge branch 'open_gj' into 'master'
修复城市未返回导致的风险识别500错误

See merge request !182
2021-11-09 15:42:08 +08:00
沈健 7856bb2bb0 修复城市未返回导致的风险识别500错误 2021-11-09 15:34:00 +08:00
gaojuan 0fd52bd622 渤海修改 2021-11-09 14:12:36 +08:00
gaojuan 9f6953d602 Merge branch 'open_gj' into 'master'
渤海修改

See merge request !181
2021-11-09 13:16:48 +08:00
gaojuan d26baea109 房源 11个城市 2021-11-05 21:18:29 +08:00