From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期三, 03 十一月 2021 17:26:50 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActWorkGuideVO.java | 26 +++++++++++++++++++------- 1 files changed, 19 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..ea1779e 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,18 +24,27 @@ 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; -- Gitblit v1.7.1