Merge branch 'open_v2' of http://gitlab.fangjia.com/dev0/main into open_v2

This commit is contained in:
2025-08-26 16:25:16 +08:00
@@ -4148,15 +4148,15 @@ public class PropertyController {
item.append("district", district.getRegion()); item.append("district", district.getRegion());
item.append("name", district.getName()); item.append("name", district.getName());
item.append("address", district.getAddress()); item.append("address", district.getAddress());
item.append("latBaidu", district.getLat2()); // item.append("latBaidu", district.getLat2());
item.append("lngBaidu", district.getLng2()); // item.append("lngBaidu", district.getLng2());
item.append("houseHoldCount", district.getHouseholdCount()); // item.append("houseHoldCount", district.getHouseholdCount());
if (district.getAlias() != null && district.getAlias().size() > 0) { // if (district.getAlias() != null && district.getAlias().size() > 0) {
item.append("alias", district.getAlias()); // item.append("alias", district.getAlias());
} // }
if (CollectionUtils.isNotEmpty(district.getAddrAlias())) { // if (CollectionUtils.isNotEmpty(district.getAddrAlias())) {
item.append("address_alias", district.getAddrAlias()); // item.append("address_alias", district.getAddrAlias());
} // }
result.add(item); result.add(item);
} }
} }
@@ -4221,15 +4221,15 @@ public class PropertyController {
item.append("district", district.getRegion()); item.append("district", district.getRegion());
item.append("name", district.getName()); item.append("name", district.getName());
item.append("address", district.getAddress()); item.append("address", district.getAddress());
item.append("latBaidu", district.getLat2()); // item.append("latBaidu", district.getLat2());
item.append("lngBaidu", district.getLng2()); // item.append("lngBaidu", district.getLng2());
item.append("houseHoldCount", district.getHouseholdCount()); // item.append("houseHoldCount", district.getHouseholdCount());
if (district.getAlias() != null && district.getAlias().size() > 0) { // if (district.getAlias() != null && district.getAlias().size() > 0) {
item.append("alias", district.getAlias()); // item.append("alias", district.getAlias());
} // }
if (CollectionUtils.isNotEmpty(district.getAddrAlias())) { // if (CollectionUtils.isNotEmpty(district.getAddrAlias())) {
item.append("address_alias", district.getAddrAlias()); // item.append("address_alias", district.getAddrAlias());
} // }
result.add(item); result.add(item);
} }
} }