From 242d318e85df66b916f554d64a026cfe0cb58e19 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 15 一月 2026 10:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

---
 tms/src/main/java/com/ruoyi/tms/domain/TmsQuoteDetail.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsQuoteDetail.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsQuoteDetail.java
index 18ec9d7..20ff44b 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsQuoteDetail.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsQuoteDetail.java
@@ -218,5 +218,62 @@
 
     @TableField(exist = false)
     private List<QuoteDetailItem> quoteItems;
+    /** 绋庣偣 % */
+    @Excel(name = "绋庣偣 %")
+    @TableField("tax_rate")
+    private BigDecimal taxRate;
 
+
+    /** 鏄惁鍒嗘寮�绁� 0-鍚� 1-鏄� */
+    @Excel(name = "鏄惁鍒嗘寮�绁� 0-鍚� 1-鏄�")
+    @TableField("is_segmented_invoice")
+    private Integer isSegmentedInvoice;
+
+
+    /** 绗竴娈佃繍璐规姤浠� */
+    @Excel(name = "绗竴娈佃繍璐规姤浠�")
+    @TableField("segment1_freight_quote")
+    private BigDecimal segment1FreightQuote;
+
+
+    /** 绗竴娈佃繍璐瑰竵鍊� */
+    @Excel(name = "绗竴娈佃繍璐瑰竵鍊�")
+    @TableField("segment1_currency")
+    private String segment1Currency;
+
+
+    /** 绗竴娈电◣鐐� % */
+    @Excel(name = "绗竴娈电◣鐐� %")
+    @TableField("segment1_tax_rate")
+    private BigDecimal segment1TaxRate;
+
+
+    /** 绗簩娈佃繍璐规姤浠� */
+    @Excel(name = "绗簩娈佃繍璐规姤浠�")
+    @TableField("segment2_freight_quote")
+    private BigDecimal segment2FreightQuote;
+
+
+    /** 绗簩娈佃繍璐瑰竵鍊� */
+    @Excel(name = "绗簩娈佃繍璐瑰竵鍊�")
+    @TableField("segment2_currency")
+    private String segment2Currency;
+
+
+    /** 绗簩娈电◣鐐� % */
+    @Excel(name = "绗簩娈电◣鐐� %")
+    @TableField("segment2_tax_rate")
+    private BigDecimal segment2TaxRate;
+
+
+    /** 鎬昏繍璐逛汉姘戝竵鎶ヤ环 */
+    @Excel(name = "鎬昏繍璐逛汉姘戝竵鎶ヤ环")
+    @TableField("total_freight_cny")
+    private BigDecimal totalFreightCny;
+
+
+    /** 鎬昏繍璐规腐甯佹姤浠� */
+    @Excel(name = "鎬昏繍璐规腐甯佹姤浠�")
+    @TableField("total_freight_hkd")
+    private BigDecimal totalFreightHkd;
 }

--
Gitblit v1.8.0