From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
index 40dbc1b..78def76 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java
@@ -1,12 +1,17 @@
package com.panzhihua.common.model.vos.community;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
/**
* @author: llming
@@ -16,13 +21,17 @@
@ApiModel("实有房屋（小区）")
public class ComMngVillageVO {
+ @ApiModelProperty("小区id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long villageId;
+
@ApiModelProperty("街路巷")
@NotBlank(groups = {AddGroup.class}, message = "街路巷不能为空")
private String alley;
@ApiModelProperty("门牌号")
@NotBlank(groups = {AddGroup.class}, message = "门牌号不能为空")
- private Integer houseNum;
+ private String houseNum;
@ApiModelProperty("小区（组）")
private String groupAt;
@@ -31,5 +40,28 @@
private Long communityId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
private Date createAt;
+
+ @ApiModelProperty("小区类型（1.城镇 2.农村 3.未知）")
+ private Integer type;
+
+ @ApiModelProperty("小区地址")
+ private String address;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("更新时间")
+ private Date updateAt;
+
+ @ApiModelProperty("栋数")
+ private Integer floorTotal = 0;
+
+ @ApiModelProperty("户数")
+ private Integer houseTotal = 0;
+
+ @ApiModelProperty("人口数")
+ private Integer populationTotal = 0;
+
+ @ApiModelProperty("车辆数")
+ private Integer carTotal = 0;
}
--
Gitblit v1.7.1