From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjReservation.java | 23 +++++++++++++++++++----
1 files changed, 19 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 35c64a7..6b98f0b 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
@@ -20,6 +20,7 @@
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.poi.ss.usermodel.IndexedColors;
/**
* 浣撴棰勭害瀵硅薄 tj_reservation
@@ -189,6 +190,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,10 +216,10 @@
/**
* 閮ㄩ棬
*/
- @ExcelExport(value = "閮ㄩ棬",sort =-2)
- @ExcelImport("閮ㄩ棬")
- @Excel(name = "閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING)
- @ApiModelProperty("閮ㄩ棬")
+ @ExcelExport(value = "鍗曚綅閮ㄩ棬",sort =-2)
+ @ExcelImport("鍗曚綅閮ㄩ棬")
+ @Excel(name = "鍗曚綅閮ㄩ棬",sort = 2,cellType = Excel.ColumnType.STRING,color = IndexedColors.RED)
+ @ApiModelProperty("鍗曚綅閮ㄩ棬")
private String department;
/**
@@ -330,6 +342,9 @@
@ApiModelProperty("绱㈠紩鍗″彿")
private String indexCard;
+ @ApiModelProperty("鏈夋晥澶╂暟")
+ private Integer yxts;
+
@Override
--
Gitblit v1.8.0