From 33a80f6b0585a320872477f85a50aa10ca1d20b1 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 18:01:51 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
index 82ea884..9e10a6d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngStructHouseVO.java
@@ -1,13 +1,17 @@
package com.panzhihua.common.model.vos.community;
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
+import java.util.Date;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
-import java.util.Date;
+
+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;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -20,10 +24,11 @@
public class ComMngStructHouseVO {
@ApiModelProperty("id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("房屋地址编号")
- @NotBlank(groups = {AddGroup.class},message = "房屋地址编号不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "房屋地址编号不能为空")
private String houseCode;
@ApiModelProperty("房屋地址")
@@ -45,7 +50,7 @@
private Date updateAt;
@ApiModelProperty("房屋面积")
- @Min(value = 1,groups = {AddGroup.class},message = "房屋面积不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "房屋面积不能为空")
private Double square;
@ApiModelProperty("居住用户名字-多个用，隔开")
@@ -55,20 +60,20 @@
private String phones;
@ApiModelProperty("房屋状态 1 自主 2 租住 3 商用")
- @Min(value = 1,groups = {AddGroup.class},message = "房屋状态不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "房屋状态不能为空")
private Integer state;
@ApiModelProperty("身份 1租户 2房主")
- @Min(value = 1,groups = {AddGroup.class},message = "身份不能为空")
+ @Min(value = 1, groups = {AddGroup.class}, message = "身份不能为空")
private Integer identity;
- @ApiModelProperty(value = "登录用户id",hidden = true)
+ @ApiModelProperty(value = "登录用户id", hidden = true)
private Long userId;
- @ApiModelProperty(value = "小区地址id",hidden = true)
+ @ApiModelProperty(value = "小区地址id", hidden = true)
private Long areaId;
- @ApiModelProperty(value = "小区地址编码",hidden = true)
+ @ApiModelProperty(value = "小区地址编码", hidden = true)
private String areaCode;
}
--
Gitblit v1.7.1