From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 09:17:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java
index b2d0e21..1a4d209 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructAreaVO.java
@@ -1,11 +1,14 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.omg.PortableInterceptor.INACTIVE;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,12 +24,14 @@
private Long id;
@ApiModelProperty("社区id")
- private String communityId;
+ private Long communityId;
@ApiModelProperty("小区名称")
+ @NotBlank(groups = {AddGroup.class}, message = "小区名称不能为空")
private String areaName;
@ApiModelProperty("地址详情")
+ @NotBlank(groups = {AddGroup.class}, message = "地址详情不能为空")
private String addressDetail;
@ApiModelProperty("创建时间")
@@ -52,4 +57,7 @@
@ApiModelProperty("是否累加门牌号 0 否 1 是")
private Integer isAccumulation;
+
+ @ApiModelProperty("小区门牌号导入规则")
+ private String doorNum;
}
--
Gitblit v1.7.1