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 |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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 13eefb4..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
@@ -125,6 +125,32 @@
      */
     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;
     }

--
Gitblit v1.8.0