From 22c6efea632a63eda3d7293346993c558646f70b Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Sat, 6 Sep 2025 12:52:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/property/domain/TbBuilding.java | 8 ++++---- .../java/org/dromara/property/domain/TbCommunity.java | 8 ++++---- .../org/dromara/property/domain/bo/TbBuildingBo.java | 10 +++++----- .../org/dromara/property/domain/bo/TbCommunityBo.java | 10 +++++----- .../org/dromara/property/domain/vo/TbBuildingVo.java | 10 +++++----- .../org/dromara/property/domain/vo/TbCommunityVo.java | 10 +++++----- .../property/service/impl/TbBuildingServiceImpl.java | 2 +- .../property/service/impl/TbCommunityServiceImpl.java | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java index b6c72f68..cb92a912 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbBuilding.java @@ -76,10 +76,10 @@ public class TbBuilding extends TenantEntity { */ private Date completionDate; - /** - * 地址 - */ - private String addr; +// /** +// * 地址 +// */ +// private String addr; /** * 经度 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java index fc765685..da340c60 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbCommunity.java @@ -58,10 +58,10 @@ public class TbCommunity extends TenantEntity { */ private String district; -// /** -// * 地址 -// */ -// private String addr; + /** + * 地址 + */ + private String addr; /** * 经度 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java index 06ed65fe..76aa6cdc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbBuildingBo.java @@ -77,11 +77,11 @@ public class TbBuildingBo extends BaseEntity { */ private Date completionDate; - /** - * 地址 - */ - @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class}) - private String addr; +// /** +// * 地址 +// */ +// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class}) +// private String addr; /** * 经度 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java index c009d74c..a953c0a4 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbCommunityBo.java @@ -61,11 +61,11 @@ public class TbCommunityBo extends BaseEntity { */ private String district; -// /** -// * 地址 -// */ -// @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class}) -// private String addr; + /** + * 地址 + */ + @NotBlank(message = "地址不能为空", groups = {AddGroup.class, EditGroup.class}) + private String addr; /** * 经度 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java index 6ac2ba2b..ce1d24e0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbBuildingVo.java @@ -89,11 +89,11 @@ public class TbBuildingVo implements Serializable { @ExcelProperty(value = "竣工日期") private Date completionDate; - /** - * 地址 - */ - @ExcelProperty(value = "地址") - private String addr; +// /** +// * 地址 +// */ +// @ExcelProperty(value = "地址") +// private String addr; /** * 经度 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java index 086ef84b..c2e0cff8 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbCommunityVo.java @@ -65,11 +65,11 @@ public class TbCommunityVo implements Serializable { @ExcelProperty(value = "区") private String district; -// /** -// * 地址 -// */ -// @ExcelProperty(value = "地址") -// private String addr; + /** + * 地址 + */ + @ExcelProperty(value = "地址") + private String addr; /** * 经度 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java index 791e373f..20b85250 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbBuildingServiceImpl.java @@ -95,7 +95,7 @@ public class TbBuildingServiceImpl implements ITbBuildingService { lqw.eq(bo.getBuildType() != null, TbBuilding::getBuildType, bo.getBuildType()); lqw.eq(bo.getElevatorCount() != null, TbBuilding::getElevatorCount, bo.getElevatorCount()); lqw.eq(bo.getCompletionDate() != null, TbBuilding::getCompletionDate, bo.getCompletionDate()); - lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbBuilding::getAddr, bo.getAddr()); +// lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbBuilding::getAddr, bo.getAddr()); lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbBuilding::getLon, bo.getLon()); lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbBuilding::getLat, bo.getLat()); lqw.eq(bo.getSort() != null, TbBuilding::getSort, bo.getSort()); diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java index ea5550c2..ab4cc5a7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbCommunityServiceImpl.java @@ -178,7 +178,7 @@ public class TbCommunityServiceImpl implements ITbCommunityService { lqw.eq(StringUtils.isNotBlank(bo.getProvince()), TbCommunity::getProvince, bo.getProvince()); lqw.eq(StringUtils.isNotBlank(bo.getCity()), TbCommunity::getCity, bo.getCity()); lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), TbCommunity::getDistrict, bo.getDistrict()); -// lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbCommunity::getAddr, bo.getAddr()); + lqw.eq(StringUtils.isNotBlank(bo.getAddr()), TbCommunity::getAddr, bo.getAddr()); lqw.eq(StringUtils.isNotBlank(bo.getLon()), TbCommunity::getLon, bo.getLon()); lqw.eq(StringUtils.isNotBlank(bo.getLat()), TbCommunity::getLat, bo.getLat()); lqw.eq(bo.getArea() != null, TbCommunity::getArea, bo.getArea());