From aa9d5899deda2c9a9c4da111e89509136f1c4ec2 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 14:29:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index ff85fb5..72ee094 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.community;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
@@ -74,7 +75,7 @@
@ApiModelProperty("门牌号")
@NotBlank(groups = {AddGroup.class},message = "门牌号不可为空")
- private Integer doorNo;
+ private String doorNo;
@ApiModelProperty("楼排号")
@NotBlank(groups = {AddGroup.class},message = "楼排号不可为空")
@@ -111,9 +112,11 @@
private String label;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("修改时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
@ApiModelProperty("籍贯")
--
Gitblit v1.7.1