From 52b3796bfe8d797e038a3af5f447d4832f9745e8 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 17 十月 2024 11:28:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
index 3629ebf..679d72d 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
@@ -105,6 +105,84 @@
@TableField(exist = false)
private TjCustomer customer;
+ /**
+ * 鍚堝苟鍚庣殑鐖秈d
+ */
+ private String parentId;
+
+ /**
+ * 鍚憀is鐢宠鍗曠殑妫�楠屽簭鍙�
+ */
+ private String jyxh;
+
+ /**
+ * 鏍囨湰浠ｇ爜
+ */
+ private String specimenTypeCode;
+
+ /**
+ * 鏄惁涓哄悎骞堕」鐩� 1鏄� 0鍚�
+ */
+ private Integer isMerge;
+
+ /**
+ * lis妫�楠岄」鐩唬鐮�
+ */
+ private String jyxmdm;
+
+ /**
+ * 琛ュ綍椤圭洰鏍囧織缂栫爜
+ */
+ private String jxbz;
+
+ public String getJxbz() {
+ return jxbz;
+ }
+
+ public void setJxbz(String jxbz) {
+ this.jxbz = jxbz;
+ }
+
+ public String getJyxmdm() {
+ return jyxmdm;
+ }
+
+ public void setJyxmdm(String jyxmdm) {
+ this.jyxmdm = jyxmdm;
+ }
+
+ public Integer getIsMerge() {
+ return isMerge;
+ }
+
+ public void setIsMerge(Integer isMerge) {
+ this.isMerge = isMerge;
+ }
+
+ public String getSpecimenTypeCode() {
+ return specimenTypeCode;
+ }
+
+ public void setSpecimenTypeCode(String specimenTypeCode) {
+ this.specimenTypeCode = specimenTypeCode;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(String parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getJyxh() {
+ return jyxh;
+ }
+
+ public void setJyxh(String jyxh) {
+ this.jyxh = jyxh;
+ }
+
public void setId(String id) {
this.id = id;
}
@@ -187,6 +265,9 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deleted", getDeleted())
+ .append("parentId", getParentId())
+ .append("jyxh", getJyxh())
+ .append("specimenTypeCode", getSpecimenTypeCode())
.toString();
}
}
--
Gitblit v1.8.0