diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java index 0101be7..23985a1 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java @@ -1,6 +1,5 @@ package com.zcloud.fire.check.dto.clientobject; -import com.alibaba.cola.dto.ClientObject; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,19 +7,7 @@ import lombok.Data; * 消防点位设备数量 */ @Data -public class FirePointDeviceCO extends ClientObject { - - @ApiModelProperty(value = "消防点位id") - private String firePointId; - - @ApiModelProperty(value = "消防点位") - private String firePointName; - - @ApiModelProperty(value = "经度") - private String longitude; - - @ApiModelProperty(value = "纬度") - private String latitude; +public class FirePointDeviceCO extends FirePointCO { @ApiModelProperty(value = "消防设备类型") private String fireDeviceType; diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java index 5019231..2406a69 100644 --- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java @@ -6,15 +6,7 @@ import lombok.Data; * 消防点位设备数量 */ @Data -public class FirePointDeviceCountDO { - - private String firePointId; - - private String firePointName; - - private String longitude; - - private String latitude; +public class FirePointDeviceCountDO extends FirePointDO { private String fireDeviceType; diff --git a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml index af57297..6b22136 100644 --- a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml @@ -103,10 +103,7 @@