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/TjCustomer.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 708a0f4..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;
+
/**
* 瀹㈡埛鎬у埆
*/
@@ -307,9 +319,23 @@
@ApiModelProperty("搴ф満")
private String dwPhone;
- @ApiModelProperty("灏辫瘖缂栧彿")
- private String cardId;
+ @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() {
@@ -336,6 +362,9 @@
.append("updateTime", getUpdateTime())
.append("deleted", getDeleted())
.append("dwPhone", getDwPhone())
+ .append("compId", getDictCompId())
+ .append("compName", getCompName())
+ .append("hisJzkh", getHisJzkh())
.toString();
}
}
--
Gitblit v1.8.0