From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
index 2e75a14..554487c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
@@ -48,6 +48,18 @@
@ExcelImport(value = "濮撳悕", required = true)
private String cusName;
+
+ @ApiModelProperty(value = "鎷奸煶鐮�")
+ private String pym;
+
+
+ @ApiModelProperty("灏辫瘖缂栧彿")
+ private String cardId;
+
+
+ @ApiModelProperty("鎮ｈ�卙is ID锛屾偅鑰呭敮涓�鍙�")
+ private String pationId;
+
/**
* 瀹㈡埛鎬у埆
*/
@@ -212,7 +224,7 @@
* 浣撴鏃堕棿
*/
@TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date tjTime;
/**
@@ -304,6 +316,26 @@
@TableField(exist = false)
private String tjCategory;
+ @ApiModelProperty("搴ф満")
+ private String dwPhone;
+
+ @ApiModelProperty("鏂囧寲绋嬪害")
+ private String wenHua;
+
+ @ApiModelProperty(value = "鑱屼笟鍘嗗彶")
+ @TableField(exist = false)
+ private List<TjAskWorkLog> workLogs;
+
+ @TableField(exist = false)
+ private String isBlack;
+
+ private Long dictCompId;
+
+ private String compName;
+
+ private String hisJzkh;
+
+ private String gl;
@Override
public String toString() {
@@ -329,6 +361,10 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deleted", getDeleted())
+ .append("dwPhone", getDwPhone())
+ .append("compId", getDictCompId())
+ .append("compName", getCompName())
+ .append("hisJzkh", getHisJzkh())
.toString();
}
}
--
Gitblit v1.8.0