From 3115396024e3e7021696dfa9e7ac2157f0e6c225 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 27 八月 2024 18:20:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java |    2 ++
 1 files changed, 2 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..643c856 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")

--
Gitblit v1.8.0