From 67b7fca6f21c2088a1887ba2027360efdb089c1c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 16:08:12 +0800
Subject: [PATCH] 代码合并冲突解决
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java
index cbd4549..c8dcdb5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventDeleteDTO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.dtos.grid;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.List;
-
/**
* 删除表单
@@ -13,14 +14,15 @@
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
* @since 1.0
- * @date 2021-05-26
- * */
+ * @date 2021-05-28
+ */
@Data
@ApiModel("删除事件请求参数")
public class EventDeleteDTO {
@ApiModelProperty(value = "id", hidden = false, example = "1")
- private Long id;
+ @NotNull(message = "事件ID不能为空")
+ private List<String> id;
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
--
Gitblit v1.7.1