From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 736ac59..aec4fc6 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
@@ -122,6 +122,11 @@
@JsonSerialize(using = ToStringSerializer.class)
private String firmId;
+ @ApiModelProperty(value = "鍗曚綅鍚嶇О")
+ private String firmName;
+
+
+
/**
* 閮ㄩ棬鍚�
*/
@@ -153,7 +158,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎬绘鏃堕棿", defaultValue = "鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鎬绘鏃堕棿")
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date checkTime;
/**
@@ -439,10 +444,17 @@
@ApiModelProperty("棰勭害鍙�")
private String reservationId;
+ @ApiModelProperty(value = "鎶樻墸")
+ private String discount;
+
@TableField(exist = false)
private Integer dycs;
+
+ @TableField(exist = false)
+ private String zt;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0