From 599542cc2132f9fb4d55ff0db1a18b600b12a1c0 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 27 Feb 2026 17:35:19 +0800
Subject: [PATCH] =?UTF-8?q?1.0.73=20=E5=90=88=E5=90=8C=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B4=A8=E4=BF=9D=E6=9C=9F=E6=8F=8F=E8=BF=B0=E3=80=81?=
 =?UTF-8?q?=E4=BA=A4=E8=B4=A7=E5=9C=B0=E7=82=B9=E3=80=81=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/oa/erp/domain/ErpContractInfo.java | 15 +++++++++++++++
 .../oa/erp/domain/bo/ErpContractInfoBo.java    | 15 +++++++++++++++
 .../oa/erp/domain/vo/ErpContractInfoVo.java    | 18 ++++++++++++++++++
 .../mapper/oa/erp/ErpContractInfoMapper.xml    |  3 +++
 4 files changed, 51 insertions(+)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
index 73f2e1a6..ff20aafa 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
@@ -172,6 +172,21 @@ public class ErpContractInfo extends TenantEntity {
      */
     private Long warrantyPeriod;
 
+    /**
+     * 质保期描述
+     */
+    private String warrantyPeriodDescription;
+
+    /**
+     * 交货地点
+     */
+    private String deliveryLocation;
+
+    /**
+     * 运输方式
+     */
+    private String shipMethod;
+
     /**
      * 合同税率(预留)
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
index 17ebaed4..e201f53a 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
@@ -175,6 +175,21 @@ public class ErpContractInfoBo extends BaseEntity {
      */
     private Long warrantyPeriod;
 
+    /**
+     * 质保期描述
+     */
+    private String warrantyPeriodDescription;
+
+    /**
+     * 交货地点
+     */
+    private String deliveryLocation;
+
+    /**
+     * 运输方式
+     */
+    private String shipMethod;
+
     /**
      * 合同税率(预留)
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
index dfe0eaf3..f862c69f 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
@@ -220,6 +220,24 @@ public class ErpContractInfoVo implements Serializable {
     @ExcelDictFormat(readConverterExp = "天=")
     private Long warrantyPeriod;
 
+    /**
+     * 质保期描述
+     */
+    @ExcelProperty(value = "质保期描述")
+    private String warrantyPeriodDescription;
+
+    /**
+     * 交货地点
+     */
+    @ExcelProperty(value = "交货地点")
+    private String deliveryLocation;
+
+    /**
+     * 运输方式
+     */
+    @ExcelProperty(value = "运输方式")
+    private String shipMethod;
+
     /**
      * 合同税率(预留)
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
index 9860f767..6759bedb 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
@@ -37,6 +37,9 @@
                t.order_contract_code,
                t.project_contract_code,
                t.warranty_period,
+               t.warranty_period_description,
+               t.delivery_location,
+               t.ship_method,
                t.tax_rate,
                t.remark,
                t.signing_place,