From b83df5a43c563bac919dee41d3a8b794f22f1030 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 19:20:45 +0800
Subject: [PATCH] zjh202412013
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrder.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 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 0b9696a..7c8d457 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;
/**
@@ -380,7 +385,9 @@
@ApiModelProperty(value = "鍒濆鏃堕棿")
@TableField(fill = FieldFill.UPDATE)
private Date confirmTime;
+
@ApiModelProperty(value = "鍒濆椹冲洖鐞嗙敱")
+ // 0鍚屾剰1鎷掔粷
private String confirmStatus;
@ApiModelProperty(value = "鍒嗙粍id")
@@ -419,6 +426,30 @@
@ApiModelProperty(value = "鎶ュ憡棰嗗彇鏂瑰紡")
private String getType;
+ /**
+ * 鎶ュ憡棰嗗彇鍦板潃
+ */
+ @TableField(exist = false)
+ private TjReportGetAddress addAddress;
+
+ /**
+ * 浣撴绫诲埆
+ */
+ @ApiModelProperty("浣撴绫诲埆")
+ private String tjCategory;
+
+ @ApiModelProperty("灏辫瘖缂栧彿")
+ private String cardId;
+
+ @ApiModelProperty("棰勭害鍙�")
+ private String reservationId;
+
+ @ApiModelProperty(value = "鎶樻墸")
+ private String discount;
+
+
+ @TableField(exist = false)
+ private Integer dycs;
@Override
public String toString() {
--
Gitblit v1.8.0