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/TjFlowingWater.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
index 37035ee..9b257cd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
@@ -1,5 +1,6 @@
package com.ltkj.hosp.domain;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -171,9 +172,41 @@
*/
@Excel(name = "鏄惁缁撹处",dictType="sys_yes_no")
@ApiModelProperty(value = "鏄惁缁撹处")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isCheckout;
private String remarks;
+
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
+
+
+ @ApiModelProperty(value = "鑷垂宸ヨ垂")
+ private String zfgf;
+
+ @ApiModelProperty(value = "鏄惁缁撶畻 0鏈� 1宸� ")
+ private String sfjs;
+
+ @ApiModelProperty(value = "缁撶畻鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date jsrq;
+
+ @ApiModelProperty(value = "缁撶畻浜轰唬鐮�")
+ private String jsrdm;
+
+ @ApiModelProperty(value = "缁撶畻浜哄鍚�")
+ private String jsrxm;
+
+ /**
+ * 鏀惰垂id
+ */
+ private String hisWaterId;
+
+ /**
+ * 閫�璐筰d
+ */
+ private String hisTfWaterId;
@Override
@@ -187,6 +220,7 @@
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("deleted", getDeleted())
+ .append("hisWaterId", getHisWaterId())
.toString();
}
}
--
Gitblit v1.8.0