From 9c5b811fb700bc66e66dbf38ed8733e57a4edac6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:19:14 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
index 6b0e087..95e8791 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
@@ -1,14 +1,17 @@
package com.panzhihua.common.model.vos.user;
+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.Min;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -21,28 +24,30 @@
public class ComMngFamilyInfoVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("本人id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("与本人关系")
- @NotBlank(groups = {AddGroup.class},message ="与本人关系不能为空" )
+ @NotBlank(groups = {AddGroup.class}, message = "与本人关系不能为空")
private String relationship;
@ApiModelProperty("名字")
- @NotBlank(groups = {AddGroup.class},message ="名字不能为空" )
+ @NotBlank(groups = {AddGroup.class}, message = "名字不能为空")
private String name;
@ApiModelProperty("身份证号")
- @NotBlank(groups = {AddGroup.class},message ="身份证号不能为空" )
+ @NotBlank(groups = {AddGroup.class}, message = "身份证号不能为空")
private String idCard;
@ApiModelProperty("手机号")
- @NotBlank(groups = {AddGroup.class},message ="手机号不能为空" )
+ @NotBlank(groups = {AddGroup.class}, message = "手机号不能为空")
private String phone;
- @ApiModelProperty(value = "年龄",hidden = true)
+ @ApiModelProperty(value = "年龄", hidden = true)
private Integer age;
@ApiModelProperty("健康状况")
@@ -60,11 +65,11 @@
@ApiModelProperty("户口本照片 逗号隔开")
private String familyBook;
- @ApiModelProperty(value = "create_at",hidden = true)
+ @ApiModelProperty(value = "create_at", hidden = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty(value = "update_at",hidden = true)
+ @ApiModelProperty(value = "update_at", hidden = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
--
Gitblit v1.7.1