From 236ee756261300273a2e98087c014745dea1acea Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 14:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
index 06eb605..8fca8e4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java
@@ -1,16 +1,18 @@
package com.panzhihua.common.model.dtos.grid;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 编辑表单
@@ -19,7 +21,7 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("编辑社区活动 》随手拍请求参数")
public class ComActEasyPhotoEditDTO {
@@ -28,19 +30,23 @@
@ApiModelProperty(value = "自增id", hidden = false, example = "1")
private Long id;
- @NotNull() @Max(9223372036854775807L)
+ @NotNull()
+ @Max(9223372036854775807L)
@ApiModelProperty(value = "发起人id", hidden = false, example = "1")
private Long sponsorId;
- @NotBlank() @Length(max=100)
+ @NotBlank()
+ @Length(max = 100)
@ApiModelProperty(value = "发生地址", hidden = false, example = "")
private String happenAddr;
- @NotBlank() @Length(max=100)
+ @NotBlank(message = "地址备注不能为空")
+ @Length(max = 100)
@ApiModelProperty(value = "地址备注", hidden = false, example = "")
private String addrRemark;
- @NotNull() @Max(127)
+ @NotNull()
+ @Max(127)
@ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
private Integer status;
@@ -48,24 +54,23 @@
@ApiModelProperty(value = "处理人id", hidden = false, example = "1")
private Long handlerId;
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
private Date examineAt;
- @Length(max=65535)
+ @Length(max = 65535)
@ApiModelProperty(value = "详情", hidden = false, example = "")
private String detail;
- @Length(max=65535)
+ @Length(max = 65535)
@ApiModelProperty(value = "图片路径列表，逗号分隔", hidden = false, example = "")
private String photoPathList;
- @Length(max=65535)
+ @Length(max = 65535)
@ApiModelProperty(value = "处理结果", hidden = false, example = "")
private String handleResult;
- @Length(max=65535)
+ @Length(max = 65535)
@ApiModelProperty(value = "处理结果，图片路径列表，逗号分隔", hidden = false, example = "")
private String handlePhotoList;
@@ -81,16 +86,15 @@
@ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
private Integer isNeedFeedBack;
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
private Date feedbackAt;
- @Length(max=500)
+ @Length(max = 500)
@ApiModelProperty(value = "驳回原因", hidden = false, example = "")
private String rejectReason;
- @Length(max=65535)
+ @Length(max = 65535)
@ApiModelProperty(value = "封面图片", hidden = false, example = "")
private String cover;
@@ -105,7 +109,6 @@
@Max(127)
@ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
private Integer isPublicity;
-
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
--
Gitblit v1.7.1