From dd39d15b6b47679778df6a7041e7be01ddc3debd Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 08 十二月 2022 16:21:15 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java | 21 +-------------------- 1 files changed, 1 insertions(+), 20 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java index 314d9b4..12198c3 100644 --- a/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java +++ b/ycl-platform/src/main/java/com/ycl/vo/cockpit/enforcementEvents/EnforcementEventsVO.java @@ -83,25 +83,6 @@ @ApiModelProperty(value = "AI璇嗗埆鐨勪簨浠舵�绘暟") private Integer identification; @ApiModelProperty(value = "鍏蜂綋浜嬩欢鐨勬暟鎹俊鎭�") - private EnforcementEventsVO.EventVO event; + private List<EventVO> event; } - - @Data - @ApiModel(description = "鍏蜂綋浜嬩欢鐨勬暟鎹俊鎭�") - public static class EventVO { - @ApiModelProperty(value = "浜嬩欢鎻忚堪") - private String description; - @ApiModelProperty(value = "浜嬪彂鍦扮偣") - private String address; - @ApiModelProperty(value = "鍙戠敓鏃堕棿") - private String alarmTime; - @ApiModelProperty(value = "鍏宠仈鎽勫儚鐐逛綅") - private String point; - @ApiModelProperty(value = "鐩戞帶鐢婚潰") - private String picture; - @ApiModelProperty(value = "鏉ユ簮") - private String source; - } - - } -- Gitblit v1.8.0