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/TbTransition.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java
index ce9c98f..d4b5d36 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TbTransition.java
@@ -64,6 +64,9 @@
@ApiModelProperty(value = "鍘熶环")
private BigDecimal ordPrice;
+ @ApiModelProperty(value = "鎶樻墸")
+ private BigDecimal discount;
+
@ApiModelProperty(value = "鐜颁环")
private BigDecimal nowPrice;
@@ -72,6 +75,15 @@
@ApiModelProperty(value = "椤圭洰绫诲瀷 (鏀逛负鎬у埆 鐢峰コ鍏ㄩ儴)")
private String proType;
+
+ @ApiModelProperty(value = "浣撴鍙�")
+ private String tjNum;
+
+ @ApiModelProperty(value = "浣撴鍞竴鍙�")
+ private String cardId;
+
+ @ApiModelProperty(value = "鍔犻」鏍囧織")
+ private String jxbz;
@ApiModelProperty("鍞竴鏍囪瘑")
@TableField(exist = false)
@@ -86,10 +98,6 @@
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
-
- @ApiModelProperty(value = "鎶樻墸")
- @TableField(exist = false)
- private String discount;
@ApiModelProperty(value = "濂楅浠锋牸")
@TableField(exist = false)
--
Gitblit v1.8.0