From 17a443d510a0aa4c545df0d11467ff17a24cfa6a Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 16 七月 2024 14:37:39 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatArchiveVO.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
index ce3fbff..de542e1 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
@@ -66,17 +66,38 @@
     @Excel(name = " 骞撮緞 ")
     private Long age;
 
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("灞呬綇鍦�")
+    @Excel(name = " 灞呬綇鍦� ")
+    private String placeOfResidence;
+
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("鍑虹敓鍦�")
+    @Excel(name = " 鍑虹敓鍦� ")
+    private String birthplace;
+
     /**
      * 鏉ユ簮
      */
     @ApiModelProperty("鏉ユ簮")
     @Excel(name = " 鏉ユ簮 ")
-    private Long source;
+    private Long sourcefrom;
 
     /**
      * 寤烘。鏃堕棿
      */
+    /**
+     * 寤烘。鏃堕棿
+     */
     @ApiModelProperty("寤烘。鏃堕棿")
+    @Excel(name = " 寤烘。鏃堕棿 ")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date archivetime;
 
     /**
@@ -147,8 +168,4 @@
     @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
     private Integer isoperation;
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("iccardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("iccardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
-    }
 }

--
Gitblit v1.9.3