From 5bf2fd3f39c415703b153698ae5d95ed5c288aae Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 17 十二月 2025 15:23:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
index b2c39cb..6c19660 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
@@ -12,7 +12,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+import com.ruoyi.tms.domain.vo.FinanceDetailItem;
import lombok.Data;
/**
@@ -37,7 +39,7 @@
*/
@Excel(name = "璐圭敤绫诲瀷")
@TableField("fee_type")
- private Integer feeType;
+ private String feeType;
/**
@@ -129,6 +131,29 @@
@TableField("update_by")
private String updateBy;
+ /**
+ * 鍗曚环
+ */
+ @TableField("price")
+ private BigDecimal price;
+
+ /**
+ * 璁¤垂鍗曚綅
+ */
+ @TableField("unit")
+ private String unit;
+
+ /**
+ * 甯佺
+ */
+ @TableField("currency")
+ private String currency;
+
+ /**
+ * 璁¤垂鏁伴噺
+ */
+ @TableField("count")
+ private Integer count;
/**
* 鏇存柊鏃堕棿
@@ -137,5 +162,11 @@
@TableField("update_time")
private Date updateTime;
+ @TableField("status")
+ private Integer status;
+
+ @TableField(exist = false)
+ private List<FinanceDetailItem> items;
+
}
--
Gitblit v1.8.0