Commit Graph

3909 Commits

Author SHA1 Message Date
gaojuan a4d043f1f1 Merge branch 'open_v2' into 'master'
Open v2

See merge request !1228
2026-01-30 14:20:52 +08:00
gaojuan 4ccb5e9fff 查deal_sample表,加city 2026-01-30 14:39:41 +08:00
gaojuan e346591035 update 2026-01-30 12:49:48 +08:00
gaojuan b710263521 update 2026-01-30 08:53:09 +08:00
gaojuan 2d2bf820ba 商铺修改 2026-01-29 19:06:12 +08:00
gaojuan 5e4b2e20da 出租增加排序 2026-01-29 16:45:35 +08:00
gaojuan 593a29d36e 加id 2026-01-29 16:13:36 +08:00
gaojuan ce7aab4cac 去打折逻辑 2026-01-29 11:16:07 +08:00
gaojuan 8bdb7b595c 湖北征信商铺定制接口 2026-01-28 17:09:12 +08:00
gaojuan 7898ccbc1a 时间修改 2026-01-28 15:02:32 +08:00
gaojuan 531a9d9c23 新增湖北征信定制接口 2026-01-28 11:14:15 +08:00
gaojuan c2e58a189d Merge branch 'new_fjw' into 'master'
增加小程序二维码

See merge request !1227
2026-01-20 21:18:38 +08:00
gaojuan 1b12af0bd9 增加小程序二维码 2026-01-20 21:34:48 +08:00
gaojuan 6603404510 null 修改 2026-01-16 16:37:30 +08:00
gaojuan 610543644d Merge branch 'open_v2' of http://gitlab.fangjia.com/dev0/main into open_v2 2026-01-16 10:51:51 +08:00
gaojuan ca520bbfa1 添加案例价格系数调整 2026-01-16 10:45:38 +08:00
admin 48e3e71ff7 放大样本过滤条件 2026-01-15 11:14:33 +08:00
gaojuan db495f6496 匹配修改 2026-01-15 11:12:26 +08:00
admin e3c55883fb Merge branch 'open_v2' into 'master'
加入价格系统

See merge request !1226
2026-01-15 09:16:19 +08:00
gaojuan 3be9803dba 加入价格系统 2026-01-14 18:39:39 +08:00
admin 69604e06a0 Merge branch 'open_v2' into 'master'
Open v2

See merge request !1225
2026-01-14 13:37:43 +08:00
gaojuan 39ff1bca75 租金接口修改 2026-01-13 21:53:18 +08:00
gaojuan 2ffda14e94 fix bug 2026-01-13 21:09:37 +08:00
admin dfb4a30bfe 放大样本过滤条件 2026-01-13 17:09:26 +08:00
admin 2c00502263 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	projects/fangjia-open/src/main/java/com/fangjia/open/controllers/HouseController.java
2026-01-13 16:29:24 +08:00
gaojuan 04205d4c85 update bug 2026-01-13 16:26:01 +08:00
admin 11e6cfc659 放大样本过滤条件 2026-01-13 16:20:50 +08:00
gaojuan da5e04ae71 Merge branch 'script_gj' into 'master'
update

See merge request !1224
2026-01-09 17:53:29 +08:00
gaojuan 03ceb6fed4 update 2026-01-09 18:11:32 +08:00
gaojuan 2e00a876a1 test 2026-01-09 17:53:23 +08:00
gaojuan 5fb995fe33 test 2026-01-09 17:41:40 +08:00
gaojuan 0abefe7880 Merge branch 'script_gj' into 'master'
test

See merge request !1223
2026-01-09 17:35:23 +08:00
gaojuan 0e20ddf47b test 2026-01-09 17:35:18 +08:00
gaojuan 22526ed834 test 2026-01-09 17:30:51 +08:00
gaojuan e13f5bfc93 test 2026-01-09 17:29:43 +08:00
gaojuan f9d062f331 Merge branch 'script_gj' into 'master'
test

See merge request !1222
2026-01-09 17:23:34 +08:00
gaojuan d7a1883db8 Merge branch 'script_gj' into 'master'
test

See merge request !1221
2026-01-09 17:17:07 +08:00
gaojuan 6529c68f0a Merge branch 'script_gj' into 'master'
Script gj

See merge request !1220
2026-01-09 17:12:43 +08:00
gaojuan 729fc7dcd8 maven版本 2026-01-09 16:01:45 +08:00
gaojuan eb49b695ed Merge branch 'script_gj' into 'master'
maven版本

See merge request !1219
2026-01-09 15:44:10 +08:00
gaojuan 64d35d4cfb update 2026-01-09 15:17:10 +08:00
gaojuan 869bef1c7f 文件编码 2026-01-09 15:00:13 +08:00
gaojuan 68909a1e7c Merge branch 'script_gj' into 'master'
update

See merge request !1218
2026-01-09 14:59:00 +08:00
gaojuan 8fafe1e90f update 2026-01-09 14:57:34 +08:00
gaojuan b847121603 去冲突 2026-01-09 14:43:12 +08:00
gaojuan b4a96f844d Merge branch 'script_gj' into 'master'
文件编码

See merge request !1217
2026-01-09 14:42:12 +08:00
gaojuan 6d1107abf1 Merge branch 'master' of http://gitlab.fangjia.com/dev0/main into script_gj
# Conflicts:
#	projects/fangjia-script/pom.xml
2026-01-09 14:40:24 +08:00
gaojuan 4b2165713b Merge branch 'script_gj' into 'master'
update

See merge request !1216
2026-01-09 14:39:42 +08:00
gaojuan b81a29d1b2 update 2026-01-09 14:38:37 +08:00
gaojuan 69e9a76c90 换行 2026-01-09 14:36:50 +08:00