From 9e2a65e1bf0107eedf59b36cab4ace0d11e321e7 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 26 Jan 2026 18:14:34 +0800
Subject: [PATCH] =?UTF-8?q?1.0.59=20=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8A=8A=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E6=94=B9=E5=90=8D?=
 =?UTF-8?q?=E4=B8=BA=E5=8A=9E=E5=85=AC=E5=9C=B0=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=9C=B0=E3=80=81=E5=95=86=E5=8A=A1=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E3=80=81=E5=95=86=E5=8A=A1=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E7=94=B5=E8=AF=9D=E3=80=81=E6=8A=80=E6=9C=AF=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E3=80=81=E6=8A=80=E6=9C=AF=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/crm/domain/CrmCustomerInfo.java        | 27 ++++++++++++-
 .../oa/crm/domain/bo/CrmCustomerInfoBo.java   | 27 ++++++++++++-
 .../oa/crm/domain/vo/CrmCustomerInfoVo.java   | 34 +++++++++++++++-
 .../mapper/oa/crm/CrmCustomerInfoMapper.xml   | 39 +++++++++++++++++--
 4 files changed, 120 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmCustomerInfo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmCustomerInfo.java
index 21a7c072..b0f5abb6 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmCustomerInfo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/CrmCustomerInfo.java
@@ -68,10 +68,35 @@ public class CrmCustomerInfo extends TenantEntity {
     private Long ownerId;
 
     /**
-     * 详细地址
+     * 办公地
      */
     private String detailedAddress;
 
+    /**
+     * 注册地
+     */
+    private String registeredAddress;
+
+    /**
+     * 商务联系人
+     */
+    private String businessContact;
+
+    /**
+     * 商务联系人电话
+     */
+    private String businessContactPhone;
+
+    /**
+     * 技术联系人
+     */
+    private String technicalContact;
+
+    /**
+     * 技术联系人电话
+     */
+    private String technicalContactPhone;
+
     /**
      * 企业规模（10人以内  10-20人  21人-50人  51人-200人  201人-500人  500人以上）
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmCustomerInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmCustomerInfoBo.java
index 3a19534d..a54312e4 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmCustomerInfoBo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmCustomerInfoBo.java
@@ -66,10 +66,35 @@ public class CrmCustomerInfoBo extends BaseEntity {
     private Long ownerId;
 
     /**
-     * 详细地址
+     * 办公地
      */
     private String detailedAddress;
 
+    /**
+     * 注册地
+     */
+    private String registeredAddress;
+
+    /**
+     * 商务联系人
+     */
+    private String businessContact;
+
+    /**
+     * 商务联系人电话
+     */
+    private String businessContactPhone;
+
+    /**
+     * 技术联系人
+     */
+    private String technicalContact;
+
+    /**
+     * 技术联系人电话
+     */
+    private String technicalContactPhone;
+
     /**
      * 企业规模（10人以内  10-20人  21人-50人  51人-200人  201人-500人  500人以上）
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmCustomerInfoVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmCustomerInfoVo.java
index b0a0a769..32ee3383 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmCustomerInfoVo.java
+++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/vo/CrmCustomerInfoVo.java
@@ -94,11 +94,41 @@ public class CrmCustomerInfoVo implements Serializable {
     private String ownerName;
 
     /**
-     * 详细地址
+     * 办公地
      */
-    @ExcelProperty(value = "详细地址")
+    @ExcelProperty(value = "办公地")
     private String detailedAddress;
 
+    /**
+     * 注册地
+     */
+    @ExcelProperty(value = "注册地")
+    private String registeredAddress;
+
+    /**
+     * 商务联系人
+     */
+    @ExcelProperty(value = "商务联系人")
+    private String businessContact;
+
+    /**
+     * 商务联系人电话
+     */
+    @ExcelProperty(value = "商务联系人电话")
+    private String businessContactPhone;
+
+    /**
+     * 技术联系人
+     */
+    @ExcelProperty(value = "技术联系人")
+    private String technicalContact;
+
+    /**
+     * 技术联系人电话
+     */
+    @ExcelProperty(value = "技术联系人电话")
+    private String technicalContactPhone;
+
     /**
      * 企业规模（10人以内  10-20人  21人-50人  51人-200人  201人-500人  500人以上）
      */
diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmCustomerInfoMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmCustomerInfoMapper.xml
index fa6d9d58..2ee6df18 100644
--- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmCustomerInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/crm/CrmCustomerInfoMapper.xml
@@ -1,13 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.oa.crm.mapper.CrmCustomerInfoMapper">
     <resultMap type="org.dromara.oa.crm.domain.vo.CrmCustomerInfoVo" id="CrmCustomerInfoResult">
     </resultMap>
 
     <select id="selectCustomCrmCustomerInfoVoList" resultMap="CrmCustomerInfoResult">
-        select customer_id, tenant_id, customer_name, mnemonic_name, industry_id, customer_type, customer_status, customer_level, customer_source, owner_id, detailed_address, customer_scale, parent_customer_id, customer_relationship, legal_representative, business_license_number, tax_number, bank_account_opening, bank_number, oss_id, remark, active_flag, del_flag, create_dept, create_by, create_time, update_by, update_time from crm_customer_info t
+        select customer_id,
+               tenant_id,
+               customer_name,
+               mnemonic_name,
+               industry_id,
+               customer_type,
+               customer_status,
+               customer_level,
+               customer_source,
+               owner_id,
+               detailed_address,
+               registered_address,
+               business_contact,
+               business_contact_phone,
+               technical_contact,
+               technical_contact_phone,
+               customer_scale,
+               parent_customer_id,
+               customer_relationship,
+               legal_representative,
+               business_license_number,
+               tax_number,
+               bank_account_opening,
+               bank_number,
+               oss_id,
+               remark,
+               active_flag,
+               del_flag,
+               create_dept,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from crm_customer_info t
             ${ew.getCustomSqlSegment}
     </select>