修改 处置记录列表 区域不显示问题

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/AlertCalledQueryDto.java

@@ -58,6 +58,10 @@ public class AlertCalledQueryDto {
    @ApiModelProperty(value = "所属区域")
    private String district;
 
+   @ExcelIgnore
+   @ApiModelProperty(value = "市+区")
+   private String address;
+
    @ExcelProperty(value = "警情类型", index = 8)
    @ApiModelProperty(value = "警情类型")
    private String alertType;

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -187,7 +187,7 @@
 		a.device_id AS deviceId,
 		e.address AS
 		elevatorAddress,
-		a.address AS address,
+		CONCAT(a.city,a.district) AS address,
 		a.alarm_type AS alertType,
 		a.alert_source AS alertSource,
 		a.alert_stage AS alertStage,