Merge branch 'release' into 1.0.20

# Conflicts:
#	payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/ecommerce/EcommerceContactInfo.java
This commit is contained in:
xiafang
2024-04-29 13:38:43 +08:00

View File

@@ -20,8 +20,6 @@ package cn.felord.payment.wechat.v3.model.ecommerce;
import cn.felord.payment.wechat.enumeration.IdDocType; import cn.felord.payment.wechat.enumeration.IdDocType;
import lombok.Data; import lombok.Data;
import java.time.LocalDate;
@Data @Data
public class EcommerceContactInfo { public class EcommerceContactInfo {
private String contactType; private String contactType;
@@ -30,9 +28,9 @@ public class EcommerceContactInfo {
private String contactIdCardNumber; private String contactIdCardNumber;
private String contactIdDocCopy; private String contactIdDocCopy;
private String contactIdDocCopyBack; private String contactIdDocCopyBack;
private LocalDate contactIdDocPeriodBegin;
private String contactIdDocPeriodEnd; private String contactIdDocPeriodEnd;
private String businessAuthorizationLetter; private String businessAuthorizationLetter;
private String contactIdDocPeriodBegin;
private String mobilePhone; private String mobilePhone;
private String contactEmail; private String contactEmail;
} }