Commit Graph

2445 Commits

Author SHA1 Message Date
gaojuan 7eb6c27e49 update 2023-10-17 13:23:17 +08:00
gaojuan 3080db94ce Merge branch 'script_gj' into 'master'
重庆

See merge request !734
2023-10-17 13:17:18 +08:00
gaojuan 33e9923f31 重庆 2023-10-17 13:10:52 +08:00
gaojuan a272eaab16 Merge branch 'script_gj' into 'master'
update

See merge request !733
2023-10-17 12:55:51 +08:00
gaojuan 5311924878 Merge branch 'script_gj' into 'master'
上海

See merge request !732
2023-10-17 12:49:20 +08:00
gaojuan 498d68697d update 2023-10-17 12:49:08 +08:00
gaojuan a79bdceecc 上海 2023-10-17 12:42:44 +08:00
gaojuan 0b237bafee Merge branch 'script_gj' into 'master'
update

See merge request !731
2023-10-17 12:39:26 +08:00
gaojuan 3351881cb6 update 2023-10-17 12:29:33 +08:00
gaojuan 331550abb2 Merge branch 'script_gj' into 'master'
poi修改

See merge request !730
2023-10-17 11:48:22 +08:00
gaojuan 82c47163ea poi修改 2023-10-17 11:41:57 +08:00
gaojuan 47a00cf232 Merge branch 'script_gj' into 'master'
城市调整

See merge request !729
2023-10-10 13:58:21 +08:00
gaojuan 2487baa532 城市调整 2023-10-10 13:52:38 +08:00
gaojuan 69d1f0c960 Merge branch 'script_gj' into 'master'
update

See merge request !728
2023-10-10 13:32:30 +08:00
gaojuan 2c9fc58b80 update 2023-10-10 13:25:52 +08:00
gaojuan 173fe2a8dc Merge branch 'script_gj' into 'master'
update

See merge request !727
2023-10-10 11:43:32 +08:00
gaojuan 24e001fb19 update 2023-10-10 11:37:51 +08:00
gaojuan 5906a6e37d Merge branch 'script_gj' into 'master'
update bug

See merge request !726
2023-10-10 11:13:25 +08:00
gaojuan 7e5bf0a7ca Merge branch 'script_gj' into 'master'
修改id,同步

See merge request !725
2023-10-10 11:08:10 +08:00
gaojuan 6af4feb456 update bug 2023-10-10 11:07:49 +08:00
gaojuan fcdf5a6ee0 修改id,同步 2023-10-10 11:02:30 +08:00
gaojuan 8c67d68aa1 Merge branch 'script_gj' into 'master'
融合10号新增一张人工指导价表

See merge request !724
2023-10-10 10:57:34 +08:00
gaojuan c5a32dbaad 融合10号新增一张人工指导价表 2023-10-10 10:52:00 +08:00
gaojuan 7dd5d73517 Merge branch 'script_gj' into 'master'
update

See merge request !723
2023-10-10 09:45:21 +08:00
gaojuan 4041af57cd update 2023-10-10 09:39:32 +08:00
gaojuan 7feff23723 Merge branch 'script_gj' into 'master'
换城市

See merge request !722
2023-10-09 18:31:12 +08:00
gaojuan 9ea850e2ce 换城市 2023-10-09 18:25:03 +08:00
gaojuan 31f0d0c8b5 Merge branch 'script_gj' into 'master'
update

See merge request !721
2023-10-09 18:02:31 +08:00
gaojuan 9e23071ef5 update 2023-10-09 17:56:59 +08:00
gaojuan 49c1de4847 Merge branch 'script_gj' into 'master'
update

See merge request !720
2023-10-07 16:49:18 +08:00
gaojuan 330d1fcb5f update 2023-10-07 16:43:46 +08:00
gaojuan bed5d19300 移动端修改 2023-09-25 14:55:19 +08:00
gaojuan faa1ce9468 冲突 2023-09-13 13:08:36 +08:00
gaojuan 4f3bd003f6 Merge branch 'fjw_version_2' of http://gitlab.fangjia.com/dev0/main into fjw_version_2
# Conflicts:
#	projects/fangjia-static/src/main/webapp/style/fangjia/v6/mobile.css
2023-09-13 10:18:58 +08:00
gaojuan 5d10b4c4d5 手机端 2023-09-13 10:17:01 +08:00
zhaojixiang@fangjia.com 3b2ff17123 网周营销 登录 移动端页面 2023-09-08 16:47:17 +08:00
gaojuan 4022a1aab5 Merge branch 'script_gj' into 'master'
upate

See merge request !719
2023-09-08 16:13:01 +08:00
gaojuan 3c442d504f upate 2023-09-08 16:09:23 +08:00
zhaojixiang@fangjia.com 50f55ba3b2 建模咨询 移动端页面 2023-09-07 17:33:22 +08:00
zhaojixiang@fangjia.com 31535fd8d7 专家服务 建模咨询 移动端页面 2023-09-07 17:07:56 +08:00
gaojuan 8d9bc6def1 Merge branch 'script_gj' into 'master'
update

See merge request !718
2023-09-06 18:00:22 +08:00
zhaojixiang@fangjia.com d5d35a0afb Merge remote-tracking branch 'origin/fjw_version_2' into fjw_version_2 2023-09-06 17:50:34 +08:00
zhaojixiang@fangjia.com 1cc0052231 数据治理 关于我们 移动端页面开发 2023-09-06 17:50:14 +08:00
gaojuan e9dbb34291 update 2023-09-06 17:49:29 +08:00
gaojuan 7f1e1503ae Merge branch 'script_gj' into 'master'
update

See merge request !717
2023-09-06 13:30:00 +08:00
gaojuan 46211a20b9 update 2023-09-06 13:26:07 +08:00
gaojuan c93b6ee596 Merge branch 'fjw_version_2' of http://gitlab.fangjia.com/dev0/main into fjw_version_2
# Conflicts:
#	projects/fangjia-coresite/src/main/webapp/header/v6/_footer.ftl
#	projects/fangjia-static/src/main/webapp/style/fangjia/v6/common.css
2023-09-06 11:14:37 +08:00
gaojuan 061e48f70e 底部修改 2023-09-06 11:11:54 +08:00
zhaojixiang@fangjia.com 6a72f5002c 页面适配调整 2023-09-04 18:02:41 +08:00
zhaojixiang@fangjia.com 5a5fa17c2c 页面适配调整 2023-09-04 18:02:21 +08:00