From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 a22ac3a..2848ac6 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,6 +1,8 @@
package com.panzhihua.common.model.vos.user;
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;
@@ -21,9 +23,11 @@
public class ComMngFamilyInfoVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("本人id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("与本人关系")
@@ -42,18 +46,24 @@
@NotBlank(groups = {AddGroup.class},message ="手机号不能为空" )
private String phone;
- @ApiModelProperty("年龄")
- @Min(value = 1,groups = {AddGroup.class},message ="年龄不能为空" )
+ @ApiModelProperty(value = "年龄",hidden = true)
private Integer age;
@ApiModelProperty("健康状况")
- @NotBlank(groups = {AddGroup.class},message ="健康状况不能为空" )
private String health;
@ApiModelProperty("工作")
- @NotBlank(groups = {AddGroup.class},message ="工作不能为空" )
private String job;
+ @ApiModelProperty("证件照（人像面）照片")
+ private String cardPhotoFront;
+
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ @ApiModelProperty("户口本照片 逗号隔开")
+ private String familyBook;
+
@ApiModelProperty(value = "create_at",hidden = true)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
--
Gitblit v1.7.1