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/EventGridTodoDataDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
index 44e186e..30d5286 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
@@ -1,10 +1,10 @@
package com.panzhihua.common.model.dtos.grid;
+import javax.validation.constraints.NotNull;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotNull;
/**
* 分页查询表单
@@ -13,7 +13,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("查询用户待处理请求参数")
public class EventGridTodoDataDTO {
--
Gitblit v1.7.1