From db8e73b120963810d6febdb939612db12d26996e Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 18 十二月 2025 14:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 6c19660..3083666 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsFinanceDetail.java
@@ -15,6 +15,7 @@
import java.util.List;
import com.ruoyi.tms.domain.vo.FinanceDetailItem;
+import com.ruoyi.tms.domain.vo.FinanceDetailRow;
import lombok.Data;
/**
@@ -169,4 +170,30 @@
private List<FinanceDetailItem> items;
+ @TableField(exist = false)
+ private List<FinanceDetailRow> rowItems;
+
+ /**
+ * 鏄惁搴斾粯锛�0鍚� 1鏄級
+ */
+ @Excel(name = "鏄惁搴斾粯", readConverterExp = "0=鍚�,1=鏄�")
+ @TableField("is_yf")
+ private Integer isYF;
+
+ @Excel(name = "搴斾粯鎶ヤ环浠锋牸")
+ @TableField("yf_price")
+ private BigDecimal yfPrice;
+
+ @Excel(name = "搴斾粯甯佺")
+ @TableField("yf_currency")
+ private String yfCurrency;
+ @TableField("yf_service_provider_id_type")
+ private String yfServiceProviderIdType;
+ @TableField("yf_service_provider_id")
+ private Integer yfServiceProviderId;
+ @TableField("yf_service_provider_name")
+ private String yfServiceProviderName;
+ @TableField("yf_service_provider_type")
+ private String yfServiceProviderType;
+
}
--
Gitblit v1.8.0