Commit Graph

1933 Commits

Author SHA1 Message Date
gaojuan 47e7fa0541 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-08-31 14:38:25 +08:00
gaojuan dae1e1be34 修改增加类型判断 2023-08-31 14:38:01 +08:00
gaojuan 8bf8da818d 新增添加类型判断 2023-08-31 14:31:31 +08:00
gaojuan ed2be5b0c6 判断是否存在 2023-08-30 17:19:24 +08:00
gaojuan 0b3bf0e297 评估添加解析楼层 2023-08-29 15:37:55 +08:00
gaojuan e92c66d484 Merge branch 'script_gj' into 'master'
代码撤回

See merge request !714
2023-08-28 11:45:38 +08:00
gaojuan 42f2f2bb6d Merge branch 'script_gj' into 'master'
建行临时导出一个文件

See merge request !713
2023-08-28 11:03:42 +08:00
gaojuan 97b933451d 建行临时导出一个文件 2023-08-28 11:00:41 +08:00
gaojuan f11f846024 代码撤回 2023-08-27 11:42:51 +08:00
gaojuan 07eb7117e2 Merge branch 'script_gj' into 'master'
update

See merge request !712
2023-08-26 13:48:21 +08:00
gaojuan c11bf5ce0e update 2023-08-26 13:45:53 +08:00
gaojuan 3d3211399d Merge branch 'script_gj' into 'master'
update

See merge request !711
2023-08-26 13:40:55 +08:00
gaojuan a02526369a update 2023-08-26 13:34:26 +08:00
gaojuan 441ff0058a Merge branch 'script_gj' into 'master'
update

See merge request !710
2023-08-18 13:49:03 +08:00
gaojuan bf4e288396 update 2023-08-18 13:46:42 +08:00
gaojuan 6fca001987 Merge branch 'script_gj' into 'master'
update

See merge request !709
2023-08-17 18:17:34 +08:00
gaojuan 19e4d20ed4 update 2023-08-17 18:10:07 +08:00
gaojuan de145bd812 Merge branch 'script_gj' into 'master'
线程20-》5

See merge request !708
2023-08-17 15:02:03 +08:00
gaojuan 5fc4d9fd4e 线程20-》5 2023-08-17 14:59:49 +08:00
gaojuan 1550ce15c9 Merge branch 'script_gj' into 'master'
update

See merge request !707
2023-08-17 14:56:22 +08:00
gaojuan faafc4375c update 2023-08-17 14:54:10 +08:00
gaojuan f98e6184f5 Merge branch 'script_gj' into 'master'
update

See merge request !706
2023-08-17 14:50:51 +08:00
gaojuan 64c1f4e143 update 2023-08-17 14:48:36 +08:00
gaojuan 5ac66bcb1a Merge branch 'script_gj' into 'master'
Script gj

See merge request !705
2023-08-15 17:11:44 +08:00
gaojuan af35c80ff0 update 2023-08-15 17:09:47 +08:00
gaojuan 4fb29fc530 update 2023-08-15 17:07:59 +08:00
gaojuan 3a30c988c4 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-08-14 09:59:49 +08:00
gaojuan 5dfa5414bb 批量导入指导价加入更改小区时间 2023-08-14 09:59:15 +08:00
gaojuan c63db01d22 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-08-11 18:23:22 +08:00
gaojuan d6c786bd26 去广告 2023-08-11 18:23:09 +08:00
gaojuan bd31c6ab0c Merge branch 'script_gj' into 'master'
update

See merge request !704
2023-08-08 13:53:55 +08:00
gaojuan 7f664dfefa update 2023-08-08 13:52:33 +08:00
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