Fna接口7

yd-csf-service/src/main/java/com/yd/csf/service/model/CustomerExpand.java

@@ -57,22 +57,22 @@ public class CustomerExpand implements Serializable {
     /**
     /**
      * 居住地址
      * 居住地址
      */
      */
-    private AddressVO residenceAddress;
+    private String residenceAddress;
 
 
     /**
     /**
      * 住宅地址
      * 住宅地址
      */
      */
-    private AddressVO residentialAddress;
+    private String residentialAddress;
 
 
     /**
     /**
      * 邮寄地址
      * 邮寄地址
      */
      */
-    private AddressVO mailingAddress;
+    private String mailingAddress;
 
 
     /**
     /**
      * 公司地址
      * 公司地址
      */
      */
-    private AddressVO companyAddress;
+    private String companyAddress;
 
 
     /**
     /**
      * 公司名称
      * 公司名称

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CustomerServiceImpl.java

@@ -57,19 +57,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer>
         BeanUtils.copyProperties(customerAddRequest, customerExpand);
         BeanUtils.copyProperties(customerAddRequest, customerExpand);
         AddressVO residenceAddress = customerAddRequest.getResidenceAddress();
         AddressVO residenceAddress = customerAddRequest.getResidenceAddress();
         if (residenceAddress != null) {
         if (residenceAddress != null) {
-            customerExpand.setResidenceAddress(residenceAddress);
+            customerExpand.setResidenceAddress(residenceAddress.toString());
         }
         }
         AddressVO residentialAddress = customerAddRequest.getResidentialAddress();
         AddressVO residentialAddress = customerAddRequest.getResidentialAddress();
         if (residentialAddress != null) {
         if (residentialAddress != null) {
-            customerExpand.setResidentialAddress(residentialAddress);
+            customerExpand.setResidentialAddress(residentialAddress.toString());
         }
         }
         AddressVO mailingAddress = customerAddRequest.getMailingAddress();
         AddressVO mailingAddress = customerAddRequest.getMailingAddress();
         if (mailingAddress != null) {
         if (mailingAddress != null) {
-            customerExpand.setMailingAddress(mailingAddress);
+            customerExpand.setMailingAddress(mailingAddress.toString());
         }
         }
         AddressVO companyAddress = customerAddRequest.getCompanyAddress();
         AddressVO companyAddress = customerAddRequest.getCompanyAddress();
         if (companyAddress != null) {
         if (companyAddress != null) {
-            customerExpand.setCompanyAddress(companyAddress);
+            customerExpand.setCompanyAddress(companyAddress.toString());
         }
         }
         return customerExpand;
         return customerExpand;
     }
     }

yd-csf-service/src/main/java/com/yd/csf/service/vo/AddressVO.java

@@ -2,10 +2,12 @@ package com.yd.csf.service.vo;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.Data;
+import lombok.ToString;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 
 @Data
 @Data
+@ToString
 @Schema(description = "地址 residenceAddress-居住地址、residentialAddress-住宅地址、mailingAddress-邮寄地址、companyAddress-公司地址")
 @Schema(description = "地址 residenceAddress-居住地址、residentialAddress-住宅地址、mailingAddress-邮寄地址、companyAddress-公司地址")
 public class AddressVO implements Serializable {
 public class AddressVO implements Serializable {