From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
index 58255f8..09bf1b9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java
@@ -1,14 +1,17 @@
package com.panzhihua.common.model.vos.community;
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import org.hibernate.validator.constraints.Length;
+
import com.google.common.collect.Lists;
import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
/**
* @auther llming
@@ -21,17 +24,26 @@
private Long id;
@ApiModelProperty("办事指南标题")
- @NotNull(groups = {AddGroup.class}, message = "标题不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "标题不能为空")
@Length(groups = {AddGroup.class}, max = 35)
private String title;
@ApiModelProperty("办事指南内容")
- @NotNull(groups = {AddGroup.class}, message = "内容不能为空")
- @Length(groups = {AddGroup.class}, max = 500)
+ @NotBlank(groups = {AddGroup.class}, message = "内容不能为空")
+ @Length(groups = {AddGroup.class}, max = 5000)
private String content;
+
+ @ApiModelProperty("所属分类")
+ private Integer classify;
+
+ @ApiModelProperty("所属分类名称")
+ private String classifyName;
@ApiModelProperty("办理时间")
private String timeAt;
+
+ @ApiModelProperty("创建时间")
+ private String createAt;
@ApiModelProperty("办理地点")
private String address;
@@ -45,5 +57,7 @@
@ApiModelProperty("纬度")
private String lat;
+ private String areaCode;
+
private List<ComActWorkGuideMaterialVO> materials = Lists.newArrayList();
}
--
Gitblit v1.7.1