From 722fa40345f1fc650eaeae4a721c3ae4106d92a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 19:03:56 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatArchiveVO.java |  125 ++++++++++++++++++++++++++++++++---------
 1 files changed, 97 insertions(+), 28 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
index 84793b3..657c7ab 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
@@ -19,15 +19,14 @@
  * @author smartor
  * @date 2023-03-04
  */
-@ApiModel(value = "PatArchiveVO", description = "鎮ｈ�呮。妗堝璞�")
+@ApiModel(value = "PatArchiveVO" , description = "鎮ｈ�呮。妗堝璞�")
 @Data
 public class PatArchiveVO extends BaseEntity {
-    private static final long serialVersionUID = 1L;
 
     /**
      * 鑷ID
      */
-    @ApiModelProperty(value = "鑷ID")
+    @ApiModelProperty("鑷ID")
     private Long id;
 
     /**
@@ -45,26 +44,19 @@
     private Long sex;
 
     /**
+     * 璇佷欢绫诲瀷
+     */
+    @ApiModelProperty("璇佷欢绫诲瀷")
+    @Excel(name = " 璇佷欢绫诲瀷 ")
+    private String idcardtype;
+
+
+    /**
      * 璇佷欢鍙风爜
      */
-    @ApiModelProperty("璇佷欢鍙风爜")
-    @Excel(name = " 璇佷欢鍙风爜 ")
-    private String idcardno;
-
-    /**
-     * 鐢熸棩
-     */
-    @ApiModelProperty("鐢熸棩")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = " 鐢熸棩 ", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthdate;
-
-    /**
-     * 骞撮緞
-     */
-    @ApiModelProperty("骞撮緞")
-    @Excel(name = " 骞撮緞 ")
-    private Long age;
+    @ApiModelProperty("绫嶈疮")
+    @Excel(name = " 绫嶈疮 ")
+    private String nativePlace;
 
 
     /**
@@ -82,6 +74,37 @@
     @Excel(name = " 鍑虹敓鍦� ")
     private String birthplace;
 
+
+    /**
+     * 璇佷欢鍙风爜
+     */
+    @ApiModelProperty("璇佷欢鍙风爜")
+    @Excel(name = " 璇佷欢鍙风爜 ")
+    private String idcardno;
+
+    /**
+     * 鐢熸棩
+     */
+    @ApiModelProperty("鐢熸棩")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鐢熸棩 " , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthdate;
+
+    /**
+     * 鍏ラ櫌鏃堕棿
+     */
+    @ApiModelProperty("鍏ラ櫌鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鐢熸棩 " , width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inhosptime;
+
+    /**
+     * 骞撮緞
+     */
+    @ApiModelProperty("骞撮緞")
+    @Excel(name = " 骞撮緞 ")
+    private Long age;
+
     /**
      * 鏉ユ簮
      */
@@ -89,9 +112,6 @@
     @Excel(name = " 鏉ユ簮 ")
     private Long sourcefrom;
 
-    /**
-     * 寤烘。鏃堕棿
-     */
     /**
      * 寤烘。鏃堕棿
      */
@@ -104,6 +124,7 @@
      * 寤烘。浜�
      */
     @ApiModelProperty("寤烘。浜�")
+    @Excel(name = " 寤烘。浜� ")
     private String archiveby;
 
     /**
@@ -113,17 +134,20 @@
     @Excel(name = " 鎵嬫満鍙风爜 ")
     private String telcode;
 
+
     /**
      * 浜插睘鍙风爜
      */
     @ApiModelProperty("浜插睘鍙风爜")
+    @Excel(name = " 浜插睘鍙风爜 ")
     private String relativetelcode;
 
     /**
-     * 璇佷欢绫诲瀷
+     * 姘戞棌
      */
-    @ApiModelProperty("璇佷欢绫诲瀷")
-    private String idcardtype;
+    @ApiModelProperty("姘戞棌")
+    @Excel(name = " 姘戞棌 ")
+    private String nation;
 
     /**
      * 鏈烘瀯ID
@@ -136,6 +160,7 @@
      * 寰俊openid
      */
     @ApiModelProperty("寰俊openid")
+    @Excel(name = " 寰俊openid ")
     private String openid;
 
     /**
@@ -160,10 +185,54 @@
      * 鏍囩
      */
     @ApiModelProperty("鏍囩")
+    @Excel(name = " 鏍囩 " , cellType = Excel.ColumnType.STRING)
     private String tag;
 
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鏍囩id")
+    @Excel(name = " 鏍囩id " , cellType = Excel.ColumnType.STRING)
+    private Long tagid;
+
     @ApiModelProperty("鏍囩闆嗗悎")
-    List<PatArchivetag> tagList = new ArrayList<>();
+    private List<PatArchivetag> tagList;
+
+    /**
+     * 鏍囩
+     */
+    @ApiModelProperty("鎮ｈ�呯被鍨�")
+    @Excel(name = " 鎮ｈ�呯被鍨� " , cellType = Excel.ColumnType.STRING)
+    private String pattype;
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("閽夐拤鍙�")
+    @Excel(name = " 閽夐拤鍙� ")
+    private String dduserid;
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
+    private String dept;
+
+
+    /**
+     * 閽夐拤鍙�
+     */
+    @ApiModelProperty("绉戝")
+    @Excel(name = " 绉戝 ")
+    private String bedNo;
+
+    /**
+     * 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳
+     */
+    @ApiModelProperty("浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳")
+    @Excel(name = " 浼氬憳灞炴��:0闈炰細鍛橈紝1涓�鑸細鍛樸��2閲嶈浼氬憳 ")
+    private String viptype;
 
     @ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
     private Integer isoperation;

--
Gitblit v1.9.3