Commit Graph

2054 Commits

Author SHA1 Message Date
gaojuan d50c970df4 Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-25 18:33:09 +08:00
gaojuan 3b41e8ce09 福州脚本修改 2023-07-25 18:32:49 +08:00
zhaojixiang@fangjia.com 7bbbc84961 后台:均价管理“楼栋系数管理”功能修改
https://zentao.fangjia.com/task-view-64.html
2023-07-25 11:21:41 +08:00
gaojuan f39306ee0a Merge branch 'script_gj' into 'master'
福州脚本修改

See merge request !695
2023-07-21 18:36:46 +08:00
gaojuan f899f50de3 福州脚本修改 2023-07-21 18:32:06 +08:00
gaojuan 929d9d782b Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-07-21 18:16:07 +08:00
gaojuan d70506f4bd 为福州修改 2023-07-21 18:15:51 +08:00
gaojuan e5a0d1802b Merge branch 'open_bohai' into 'master'
防经纬度为空

See merge request !694
2023-07-21 11:54:57 +08:00
gaojuan 92fe6d0a43 防经纬度为空 2023-07-21 11:50:40 +08:00
gaojuan 23328c1834 Merge branch 'script_gj' into 'master'
update bug

See merge request !693
2023-07-20 18:12:38 +08:00
gaojuan 716eabe3e9 update bug 2023-07-20 18:08:38 +08:00
gaojuan 3a8c1893a8 Merge branch 'script_gj' into 'master'
update

See merge request !692
2023-07-20 18:01:03 +08:00
gaojuan 411f4e81ff update 2023-07-20 17:56:06 +08:00
gaojuan 98b5e8657d Merge branch 'script_gj' into 'master'
update

See merge request !691
2023-07-20 17:41:18 +08:00
gaojuan 6e63244432 update 2023-07-20 17:37:06 +08:00
gaojuan d3e0075769 Merge branch 'script_gj' into 'master'
update

See merge request !690
2023-07-20 17:22:59 +08:00
gaojuan b92d6eb9a9 update 2023-07-20 17:18:22 +08:00
gaojuan 283ea1adec Merge branch 'script_gj' into 'master'
update

See merge request !689
2023-07-20 16:13:29 +08:00
gaojuan 7a52c6764c update 2023-07-20 16:09:17 +08:00
gaojuan d560b50a08 Merge branch 'script_gj' into 'master'
updadte

See merge request !688
2023-07-19 22:36:57 +08:00
gaojuan 41d099fcb5 updadte 2023-07-19 22:32:11 +08:00
gaojuan 79d03e1641 Merge branch 'script_gj' into 'master'
update

See merge request !687
2023-07-19 14:30:38 +08:00
gaojuan 5d360349d2 update 2023-07-19 14:26:34 +08:00
gaojuan d464f9986b Merge branch 'script_gj' into 'master'
Script gj

See merge request !686
2023-07-19 14:10:49 +08:00
gaojuan 4cb278a6d1 Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-19 14:06:54 +08:00
gaojuan 8e027cceac update 2023-07-19 14:06:35 +08:00
zhaojixiang@fangjia.com 3d40f2be78 校验小区名称,别名忽略无效的 2023-07-19 13:28:47 +08:00
zhaojixiang@fangjia.com fab1cb7aa8 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-19 13:27:49 +08:00
zhaojixiang@fangjia.com 0b57dfa517 隐藏装修情况字段 2023-07-18 17:37:02 +08:00
gaojuan d2284740c1 Merge branch 'script_gj' into 'master'
写字楼后台修改  “城市统计”里面字段修改

See merge request !685
2023-07-17 18:14:52 +08:00
zhaojixiang@fangjia.com 58d62ca674 写字楼后台修改 “城市统计”里面字段修改 2023-07-17 18:04:35 +08:00
admin 555424ae00 Merge branch 'script_gj' into 'master'
Script gj

See merge request !684
2023-07-17 14:12:55 +08:00
admin c75b32c8cc Merge branch 'master' into 'script_gj'
# Conflicts:
#   projects/fangjia-bkoff/src/main/webapp/district2/editOffice.ftl
2023-07-17 14:12:34 +08:00
zhaojixiang@fangjia.com 5f51a6f0d7 写字楼后台修改 2023-07-17 13:48:08 +08:00
zhaojixiang@fangjia.com 329bd3665e 小区库新增小区功能:不允许创建与别名完全一致的小区 2023-07-17 11:39:09 +08:00
gaojuan cae2eb9556 Merge branch 'script_gj' into 'master'
100-50

See merge request !683
2023-07-14 22:24:07 +08:00
gaojuan 834c271b7d 100-50 2023-07-14 22:19:33 +08:00
gaojuan f4c9a6d7cd Merge branch 'script_gj' into 'master'
update

See merge request !682
2023-07-14 18:47:13 +08:00
gaojuan 7d1ee1a59c update 2023-07-14 18:43:22 +08:00
gaojuan deca1a41c2 Merge branch 'open_bohai' into 'master'
增加客户名

See merge request !681
2023-07-14 16:13:03 +08:00
gaojuan e04fbd86fe 增加客户名 2023-07-14 16:09:12 +08:00
gaojuan 4d1a274dfe Merge branch 'script_gj' into 'master'
Script gj

See merge request !680
2023-07-14 15:10:59 +08:00
gaojuan d87b14e611 update bug 2023-07-14 15:07:15 +08:00
gaojuan 17755d9d4e Merge branch 'master' of http://gitlab.fangjia.com/dev0/main 2023-07-14 14:28:48 +08:00
gaojuan 30364c7b05 写字楼编辑板块 2023-07-14 14:28:35 +08:00
gaojuan 21c6acfeb0 200-100 2023-07-14 13:23:21 +08:00
gaojuan 51e7bfe658 Merge branch 'script_gj' into 'master'
500-》200

See merge request !679
2023-07-14 13:17:32 +08:00
gaojuan 135099cb11 500-》200 2023-07-14 13:13:34 +08:00
gaojuan 4d025d8f1d Merge branch 'script_gj' into 'master'
删除房源

See merge request !678
2023-07-14 10:05:15 +08:00
gaojuan 995ab25529 删除房源 2023-07-14 10:01:20 +08:00