From 32c6af05f94203a7d604a97bbf6495887cc4e526 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 12 十一月 2024 09:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
index 555c484..736ac59 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java
@@ -380,7 +380,9 @@
@ApiModelProperty(value = "鍒濆鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private Date confirmTime;
+
@ApiModelProperty(value = "鍒濆椹冲洖鐞嗙敱")
+ // 0鍚屾剰1鎷掔粷
private String confirmStatus;
@ApiModelProperty(value = "鍒嗙粍id")
@@ -437,6 +439,10 @@
@ApiModelProperty("棰勭害鍙�")
private String reservationId;
+
+ @TableField(exist = false)
+ private Integer dycs;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0