From 7a1d4f5bbee4d21270a20f0af1dc3fa9296bbdcf Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 26 Jan 2026 18:14:49 +0800
Subject: [PATCH] =?UTF-8?q?1.0.60=20=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=BE=E8=AE=A2=E5=9C=B0=E7=82=B9=E3=80=81=20=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=89=A9=E6=96=99=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/oa/erp/domain/ErpContractInfo.java   | 10 ++++++++++
 .../dromara/oa/erp/domain/bo/ErpContractInfoBo.java  | 10 ++++++++++
 .../dromara/oa/erp/domain/vo/ErpContractInfoVo.java  | 12 ++++++++++++
 .../mapper/oa/erp/ErpContractInfoMapper.xml          |  2 ++
 4 files changed, 34 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 392b3fb3..2a02e82a 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
@@ -177,6 +177,16 @@ public class ErpContractInfo extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 签订地点
+     */
+    private String signingPlace;
+
+    /**
+     * 合同物料备注
+     */
+    private String materialRemark;
+
     /**
      * 激活标识（1是 0否）
      */
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 8e38cf06..9db0b6d1 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
@@ -179,6 +179,16 @@ public class ErpContractInfoBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 签订地点
+     */
+    private String signingPlace;
+
+    /**
+     * 合同物料备注
+     */
+    private String materialRemark;
+
     /**
      * 激活标识（1是 0否）
      */
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 d65bc7dd..fe1d0e1f 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
@@ -218,6 +218,18 @@ public class ErpContractInfoVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 签订地点
+     */
+    @ExcelProperty(value = "签订地点")
+    private String signingPlace;
+
+    /**
+     * 合同物料备注
+     */
+    @ExcelProperty(value = "合同物料备注")
+    private String materialRemark;
+
     /**
      * 激活标识（1是 0否）
      */
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 05e6bc30..87e14550 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
@@ -38,6 +38,8 @@
                t.warranty_period,
                t.tax_rate,
                t.remark,
+               t.signing_place,
+               t.material_remark,
                t.active_flag,
                t.contract_manager_id,
                t.capitalized_amount,