Merge branch 'master-prod-new' into master-test

chenjiahe

2023-12-26 a369ba556c3502319a94f5d5d4d23ffbdd932e39

Merge branch 'master-prod-new' into master-test

# Conflicts:
#	crm-platform-feign/src/main/java/com/hz/crm/vo/order/DeliveryAddressVo.java

 crm-platform-feign/src/main/java/com/hz/crm/vo/order/DeliveryAddressVo.java

@@ -1,4 +1,25 @@
package com.hz.crm.vo.order;

import lombok.Data;

/**
 * @author CJH
 */
@Data
public class DeliveryAddressVo {

    /**收件-联系人*/
    private String linkMan;
    /**收件-联系电话*/
    private String linkTel;
    /**收件-地址-省*/
    private String province;
    /**收件-地址-市*/
    private String city;
    /**收件-地址-区*/
    private String area;
    /**收件-地址-街道*/
    private String street;
    /**收件-地址-详细*/
    private String addrDetail;
}

 crm-platform-feign/src/main/java/com/hz/crm/vo/order/OrderAddVo.java

@@ -29,22 +29,8 @@
    /**员工名称*/
    private String staffName;

    /***********收件************/

    /**收件-联系人*/
    private String linkMan;
    /**收件-联系电话*/
    private String linkTel;
    /**收件-地址-省*/
    private String province;
    /**收件-地址-市*/
    private String city;
    /**收件-地址-区*/
    private String area;
    /**收件-地址-街道*/
    private String street;
    /**收件-地址-详细*/
    private String addrDetail;
    /**收件*/
    private DeliveryAddressVo deliveryAddress;

    /**支付方式-线上*/
    public static final int PAYMENT_METHOD_ONLINE = 1;