Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java

@@ -64,4 +64,13 @@ public class AlertCalledZhDto {
 
     @ApiModelProperty(value = "警情修改时间")
     private Date updateTime;
+
+    @ApiModelProperty(value = "处置记录url")
+    private String recordUrl;
+
+    /**
+     * 警情状态
+     */
+    @ApiModelProperty(value = "警情状态")
+    private Boolean alertStatus;
 }

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

@@ -34,6 +34,8 @@
         a.address ,
         a.coordinate_x longitude,
         a.coordinate_y latitude,
+        a.record_url,
+        a.alert_status,
         CASE a.response_level_code
         WHEN '1164' THEN '紧急出动'
         WHEN '1165' THEN '紧急集结'