Commit Graph

2558 Commits

Author SHA1 Message Date
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
gaojuan b0e4f3b51d Merge branch 'script_gj' into 'master'
update

See merge request !677
2023-07-11 18:14:56 +08:00
gaojuan e8e8050ada update 2023-07-11 18:10:38 +08:00
gaojuan 8c5531c628 Merge branch 'script_gj' into 'master'
update

See merge request !676
2023-07-10 18:03:52 +08:00
gaojuan f57632314f update 2023-07-10 17:59:34 +08:00
gaojuan 008dad1a85 Merge branch 'script_gj' into 'master'
去测试

See merge request !675
2023-07-10 17:32:10 +08:00
gaojuan d6b63e1b94 去测试 2023-07-10 17:28:02 +08:00
gaojuan 74a34fe9cd Merge branch 'script_gj' into 'master'
还原

See merge request !674
2023-07-10 16:40:11 +08:00
gaojuan 056a04a535 还原 2023-07-10 16:33:04 +08:00
gaojuan 2fef7a7be1 Merge branch 'script_gj' into 'master'
Script gj

See merge request !673
2023-07-10 16:26:58 +08:00
gaojuan af6fb6755a Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-10 16:22:58 +08:00
gaojuan dfa5c6719b update 2023-07-10 16:22:43 +08:00
zhaojixiang@fangjia.com b52037997b api管理-用户增加是否监控属性,默认不监控 2023-07-10 12:59:53 +08:00
admin 3aaf72267a Merge branch 'script_gj' into 'master'
Script gj

See merge request !672
2023-07-07 10:56:06 +08:00
zhaojixiang@fangjia.com 8bfc636b34 Merge remote-tracking branch 'origin/script_gj' into script_gj 2023-07-07 10:30:14 +08:00
zhaojixiang@fangjia.com 6f79a0f83c 楼栋系数管理增加创建人和备注属性 2023-07-07 10:28:50 +08:00
gaojuan d62a4dff98 Merge branch 'script_gj' into 'master'
Script gj

See merge request !671
2023-07-07 09:37:21 +08:00
gaojuan 8f650a16fb Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj 2023-07-07 09:33:26 +08:00
gaojuan 0ee1292192 update 2023-07-07 09:33:11 +08:00
zhaojixiang@fangjia.com 4d156c4926 楼栋系数管理增加创建人和备注属性 2023-07-07 09:24:04 +08:00
zhaojixiang@fangjia.com 86fd54d392 楼栋系数管理增加创建人和备注属性 2023-07-07 09:13:37 +08:00
admin 84b57706d6 Merge branch 'script_gj' into 'master'
Script gj

See merge request !670
2023-07-07 09:11:20 +08:00
zhaojixiang@fangjia.com fded369d14 Merge remote-tracking branch 'origin/script_gj' into script_gj 2023-07-06 18:59:47 +08:00
zhaojixiang@fangjia.com 6b4b44319c 楼栋系数管理增加创建人和备注属性 2023-07-06 18:59:18 +08:00
gaojuan 3a8c00a5b6 Merge branch 'script_gj' into 'master'
城市 + 区域

See merge request !669
2023-07-06 18:18:52 +08:00
gaojuan 02b9b2e156 城市 + 区域 2023-07-06 18:15:04 +08:00
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