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 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd">