Commit Graph

1815 Commits

Author SHA1 Message Date
gaojuan 499462af5a Merge branch 'script_gj' into 'master'
Script gj

See merge request !668
2023-07-06 18:10:02 +08:00
gaojuan c29d869f57 Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-06 18:06:27 +08:00
gaojuan 674dfa732b script 修改 2023-07-06 18:06:14 +08:00
admin 91a74d5d4b Merge branch 'script_gj' into 'master'
Script gj

See merge request !667
2023-07-06 13:46:50 +08:00
zhaojixiang@fangjia.com d095d20c2b Merge remote-tracking branch 'origin/script_gj' into script_gj 2023-07-06 13:45:49 +08:00
zhaojixiang@fangjia.com 71ab29cee7 新增楼栋系数管理模块 2023-07-06 13:41:37 +08:00
gaojuan 73edf75c3a Merge branch 'script_gj' into 'master'
update

See merge request !666
2023-06-21 18:32:49 +08:00
gaojuan 27a18ce88d update 2023-06-21 18:29:16 +08:00
gaojuan bc8da44890 Merge branch 'script_gj' into 'master'
update

See merge request !665
2023-06-21 16:00:14 +08:00
gaojuan 5a1e9a378a update 2023-06-21 15:56:17 +08:00
gaojuan 0b7e9958d8 Merge branch 'script_gj' into 'master'
update

See merge request !664
2023-06-21 15:14:01 +08:00
gaojuan 9ed8f6dc21 update 2023-06-21 15:10:18 +08:00
gaojuan 810415aee1 Merge branch 'script_gj' into 'master'
update

See merge request !663
2023-06-20 13:39:33 +08:00
gaojuan 3409e42481 update 2023-06-20 13:36:22 +08:00
gaojuan f8f5d52029 Merge branch 'script_gj' into 'master'
update

See merge request !662
2023-06-20 11:26:00 +08:00
gaojuan 3da40ce36f update 2023-06-20 11:22:46 +08:00
gaojuan ea53ac6766 搜索及任务修改 2023-06-19 19:25:21 +08:00
gaojuan 3528d2f642 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-06-16 10:54:09 +08:00
gaojuan 587af7e972 江南行小区修改添加任务 2023-06-16 10:53:58 +08:00
gaojuan 348ac31130 Merge branch 'script_gj' into 'master'
Script gj

See merge request !661
2023-06-15 10:34:33 +08:00
gaojuan 1fb6796a05 update 2023-06-15 10:31:41 +08:00
gaojuan 418a357741 update 2023-06-15 10:02:05 +08:00
gaojuan 0dcb3b61f6 换域 2023-06-13 18:31:01 +08:00
gaojuan 2d4f76d985 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-06-13 18:19:19 +08:00
gaojuan 691c963655 统计换成蒋晓春的帐号 2023-06-13 18:19:05 +08:00
gaojuan 66e8551a5f Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-06-13 13:17:57 +08:00
gaojuan ca54df8e64 板块编辑修改 2023-06-13 13:17:44 +08:00
gaojuan 694c4d5be3 Merge branch 'script_gj' into 'master'
update

See merge request !660
2023-06-12 13:43:09 +08:00
gaojuan 4022bff4b5 update 2023-06-12 13:40:19 +08:00
gaojuan 267e1e5f07 Merge branch 'script_gj' into 'master'
常州去除删除小区去掉的逻辑

See merge request !659
2023-06-12 13:38:12 +08:00
gaojuan 5d057a5f85 常州去除删除小区去掉的逻辑 2023-06-12 13:35:40 +08:00
gaojuan cfcf56b78e Merge branch 'open_bohai' into 'master'
江南行选房源修改

See merge request !658
2023-06-09 18:19:15 +08:00
gaojuan 0b84d882c7 江南行选房源修改 2023-06-09 18:16:08 +08:00
gaojuan 47763ef419 Merge branch 'script_gj' into 'master'
城市区域

See merge request !657
2023-06-09 15:33:57 +08:00
gaojuan 3f860273a0 城市区域 2023-06-09 15:30:45 +08:00
gaojuan 9f5757eeb2 Merge branch 'script_gj' into 'master'
update

See merge request !656
2023-06-09 11:11:19 +08:00
gaojuan 7bd916a214 update 2023-06-09 11:07:51 +08:00
gaojuan 01cb796cfa 加权限 2023-06-01 21:16:57 +08:00
gaojuan 45b5d44930 update 2023-06-01 09:45:33 +08:00
gaojuan 030273279b Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into open_bohai
# Conflicts:
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/AddressController.java
2023-06-01 09:41:35 +08:00
gaojuan 10fe787116 渤海修改 2023-05-31 19:37:06 +08:00
gaojuan 1c59cde56b Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-05-31 14:17:49 +08:00
gaojuan 7c29e5f2d1 房源列表添加字段 2023-05-31 14:17:14 +08:00
admin 17c2dc0974 Merge branch 'open_gj' into 'master'
优化联想

See merge request !652
2023-05-31 10:10:04 +08:00
shenjian@fangjia.com 78d9968e30 优化联想 2023-05-31 10:06:08 +08:00
shenjian@fangjia.com 3f35d0cb71 优化居委经纬度 2023-05-30 15:33:08 +08:00
gaojuan c038557aa1 Merge branch 'open_bohai' into 'master'
接口字段修改

See merge request !651
2023-05-29 14:38:18 +08:00
gaojuan 7ac13fd481 接口字段修改 2023-05-29 14:32:56 +08:00
gaojuan 4d93228d9e Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-05-29 13:49:36 +08:00
gaojuan 572d628aa0 删除开业时间 2023-05-29 13:49:20 +08:00