From 0ded4eb80a80ffd4f29aab8a7b6c02a269d72d2c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 17:40:28 +0800
Subject: [PATCH] zjh202412013

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
index 71ab52f..b0d9753 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java
@@ -99,7 +99,7 @@
      * 閭
      */
     @ExcelExport(value = "閭",sort =5)
-    @ExcelImport("鑱旂郴閭")
+    @ExcelImport("閭")
     @Excel(name = "閭",sort = 5,cellType = Excel.ColumnType.STRING)
     @ApiModelProperty("鑱旂郴閭")
     private String email;
@@ -189,6 +189,17 @@
     @ApiModelProperty("鍗曚綅鍚嶇О")
     private String company;
 
+    /**
+     * 鍗曚綅鍚嶅瓧
+     */
+    @ExcelExport(value = "閮ㄩ棬",sort =99)
+    @ExcelImport("閮ㄩ棬")
+    @Excel(name = "閮ㄩ棬",sort = 99,cellType = Excel.ColumnType.STRING)
+    @ApiModelProperty("閮ㄩ棬")
+    @TableField(exist = false)
+    private String dwxm;
+
+
     @ApiModelProperty("鍗曚綅id")
     private String companyId;
 
@@ -204,9 +215,9 @@
     /**
      * 閮ㄩ棬
      */
-    @ExcelExport(value = "閮ㄩ棬",sort =-2)
-    @ExcelImport("閮ㄩ棬")
-    @Excel(name = "閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING)
+//    @ExcelExport(value = "閮ㄩ棬",sort =-2)
+//    @ExcelImport("閮ㄩ棬")
+//    @Excel(name = "閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING)
     @ApiModelProperty("閮ㄩ棬")
     private String department;
 
@@ -330,6 +341,9 @@
     @ApiModelProperty("绱㈠紩鍗″彿")
     private String indexCard;
 
+    @ApiModelProperty("鏈夋晥澶╂暟")
+    private Integer yxts;
+
 
 
     @Override

--
Gitblit v1.8.0