From 973c18516546fe8479c9cd4a5c49c13b4a3aaf61 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Mon, 13 Oct 2025 20:32:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=95=86=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=9D=9E=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=AF=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/OriginalMerchantInfoImportVo.java | 86 +++++++++---------- ...iginalMobileBankInactiveMonthImportVo.java | 9 +- ...riginalMobileBankInactiveYearImportVo.java | 9 +- 3 files changed, 49 insertions(+), 55 deletions(-) diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMerchantInfoImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMerchantInfoImportVo.java index a90f2b9..eb76155 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMerchantInfoImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMerchantInfoImportVo.java @@ -105,7 +105,7 @@ public class OriginalMerchantInfoImportVo implements Serializable { * 商户创建时间 */ @ExcelProperty(value = "创建时间") - @NotNull(message = "创建时间不能为空") +// @NotNull(message = "创建时间不能为空") private Date merchantCreateTime; /** @@ -125,92 +125,92 @@ public class OriginalMerchantInfoImportVo implements Serializable { * 拓展员工号 */ @ExcelProperty(value = "拓展员工号") - @NotBlank(message = "拓展员工号不能为空") +// @NotBlank(message = "拓展员工号不能为空") private String salesmanId; /** * 拓展员工姓名 */ @ExcelProperty(value = "拓展员工姓名") - @NotBlank(message = "拓展员工姓名不能为空") +// @NotBlank(message = "拓展员工姓名不能为空") private String salesmanName; /** * 管理员工号 */ @ExcelProperty(value = "管理员工号") - @NotBlank(message = "管理员工号不能为空") +// @NotBlank(message = "管理员工号不能为空") private String managerId; /** * 管理员工姓名 */ @ExcelProperty(value = "管理员工姓名") - @NotBlank(message = "管理员工姓名不能为空") +// @NotBlank(message = "管理员工姓名不能为空") private String managerName; /** * 商户类型 */ @ExcelProperty(value = "商户类型") - @NotBlank(message = "商户类型不能为空") +// @NotBlank(message = "商户类型不能为空") private String merchantType; /** * 商户风险等级 */ @ExcelProperty(value = "商户风险等级") - @NotBlank(message = "商户风险等级不能为空") +// @NotBlank(message = "商户风险等级不能为空") private String riskLevel; /** * 经营范围 */ @ExcelProperty(value = "经营范围") - @NotBlank(message = "经营范围不能为空") +// @NotBlank(message = "经营范围不能为空") private String businessScope; /** * 经营范围(二级) */ @ExcelProperty(value = "经营范围（二级）") - @NotBlank(message = "经营范围(二级)不能为空") +// @NotBlank(message = "经营范围(二级)不能为空") private String businessScopeDetail; /** * 禁用类型 */ @ExcelProperty(value = "禁用类型") - @NotBlank(message = "禁用类型不能为空") +// @NotBlank(message = "禁用类型不能为空") private String disableType; /** * 详细地址 */ @ExcelProperty(value = "详细地址") - @NotBlank(message = "详细地址不能为空") +// @NotBlank(message = "详细地址不能为空") private String address; /** * 法定代表人姓名 */ @ExcelProperty(value = "法定代表人姓名") - @NotBlank(message = "法定代表人姓名不能为空") +// @NotBlank(message = "法定代表人姓名不能为空") private String legalName; /** * 法定代表人证件类型 */ @ExcelProperty(value = "法定代表人证件类型") - @NotBlank(message = "法定代表人证件类型不能为空") +// @NotBlank(message = "法定代表人证件类型不能为空") private String legalIdType; /** * 法定代表人证件号码 */ @ExcelProperty(value = "法定代表人证件号码") - @IdCard - @NotBlank(message = "法定代表人证件号码不能为空") +// @IdCard +// @NotBlank(message = "法定代表人证件号码不能为空") private String legalIdNumber; /** @@ -241,14 +241,14 @@ public class OriginalMerchantInfoImportVo implements Serializable { * 开户证件类型 */ @ExcelProperty(value = "开户证件类型") - @NotBlank(message = "开户证件类型不能为空") +// @NotBlank(message = "开户证件类型不能为空") private String accountIdType; /** * 开户证件号码 */ @ExcelProperty(value = "开户证件号码") - @NotBlank(message = "开户证件号码不能为空") +// @NotBlank(message = "开户证件号码不能为空") private String accountIdNumber; /** @@ -273,77 +273,77 @@ public class OriginalMerchantInfoImportVo implements Serializable { * 结算级别 */ @ExcelProperty(value = "结算级别") - @NotBlank(message = "结算级别不能为空") +// @NotBlank(message = "结算级别不能为空") private String settlementLevel; /** * 结算周期 */ @ExcelProperty(value = "结算周期") - @NotBlank(message = "结算周期不能为空") +// @NotBlank(message = "结算周期不能为空") private String settlementCycle; /** * 商户费率模式 */ @ExcelProperty(value = "商户费率模式") - @NotBlank(message = "商户费率模式不能为空") +// @NotBlank(message = "商户费率模式不能为空") private String feeMode; /** * 支付宝借记卡费率 */ @ExcelProperty(value = "支付宝借记卡费率") - @DecimalMin(value = "0", message = "支付宝借记卡费率必须大于等于0") - @NotNull(message = "支付宝借记卡费率不能为空") +// @DecimalMin(value = "0", message = "支付宝借记卡费率必须大于等于0") +// @NotNull(message = "支付宝借记卡费率不能为空") private BigDecimal alipayDebitRate; /** * 支付宝贷记卡费率 */ @ExcelProperty(value = "支付宝贷记卡费率") - @DecimalMin(value = "0", message = "支付宝贷记卡费率必须大于等于0") - @NotNull(message = "支付宝贷记卡费率不能为空") +// @DecimalMin(value = "0", message = "支付宝贷记卡费率必须大于等于0") +// @NotNull(message = "支付宝贷记卡费率不能为空") private BigDecimal alipayCreditRate; /** * 微信借记卡费率 */ @ExcelProperty(value = "微信借记卡费率") - @DecimalMin(value = "0", message = "微信贷记卡费率必须大于等于0") - @NotNull(message = "微信贷记卡费率不能为空") +// @DecimalMin(value = "0", message = "微信贷记卡费率必须大于等于0") +// @NotNull(message = "微信贷记卡费率不能为空") private BigDecimal wechatDebitRate; /** * 微信贷记卡费率 */ @ExcelProperty(value = "微信贷记卡费率") - @DecimalMin(value = "0", message = "微信贷记卡费率必须大于等于0") - @NotNull(message = "微信贷记卡费率不能为空") +// @DecimalMin(value = "0", message = "微信贷记卡费率必须大于等于0") +// @NotNull(message = "微信贷记卡费率不能为空") private BigDecimal wechatCreditRate; /** * 云闪付借记卡费率 */ @ExcelProperty(value = "云闪付借记卡费率") - @DecimalMin(value = "0", message = "云闪付贷记卡费率必须大于等于0") - @NotNull(message = "云闪付贷记卡费率不能为空") +// @DecimalMin(value = "0", message = "云闪付贷记卡费率必须大于等于0") +// @NotNull(message = "云闪付贷记卡费率不能为空") private BigDecimal unionpayDebitRate; /** * 云闪付贷记卡费率 */ @ExcelProperty(value = "云闪付贷记卡费率") - @DecimalMin(value = "0", message = "云闪付贷记卡费率必须大于等于0") - @NotNull(message = "云闪付贷记卡费率不能为空") +// @DecimalMin(value = "0", message = "云闪付贷记卡费率必须大于等于0") +// @NotNull(message = "云闪付贷记卡费率不能为空") private BigDecimal unionpayCreditRate; /** * 智e付费率 */ @ExcelProperty(value = "智e付费率") - @DecimalMin(value = "0", message = "智e付费率必须大于等于0") - @NotNull(message = "智e付费率不能为空") +// @DecimalMin(value = "0", message = "智e付费率必须大于等于0") +// @NotNull(message = "智e付费率不能为空") private BigDecimal smartPayRate; /** @@ -374,42 +374,42 @@ public class OriginalMerchantInfoImportVo implements Serializable { * 收银台支付类型 */ @ExcelProperty(value = "收银台支付类型") - @NotBlank(message = "收银台支付类型不能为空") +// @NotBlank(message = "收银台支付类型不能为空") private String paymentTypes; /** * 静态码支付类型 */ @ExcelProperty(value = "静态码支付类型") - @NotBlank(message = "静态码支付类型不能为空") +// @NotBlank(message = "静态码支付类型不能为空") private String staticCodeTypes; /** * 结算账号 */ @ExcelProperty(value = "结算账号") - @NotBlank(message = "结算账号不能为空") +// @NotBlank(message = "结算账号不能为空") private String accountNumber; /** * 账户名称 */ @ExcelProperty(value = "账户名称") - @NotBlank(message = "账户名称不能为空") +// @NotBlank(message = "账户名称不能为空") private String accountName; /** * 开户行机构号 */ @ExcelProperty(value = "开户行机构号") - @NotBlank(message = "开户行机构号不能为空") +// @NotBlank(message = "开户行机构号不能为空") private String bankCode; /** * 开户行名称 */ @ExcelProperty(value = "开户行名称") - @NotBlank(message = "开户行名称不能为空") +// @NotBlank(message = "开户行名称不能为空") private String bankName; /** @@ -428,15 +428,15 @@ public class OriginalMerchantInfoImportVo implements Serializable { * 联系人姓名 */ @ExcelProperty(value = "联系人姓名") - @NotBlank(message = "联系人姓名不能为空") +// @NotBlank(message = "联系人姓名不能为空") private String contactName; /** * 联系人手机号码 */ @ExcelProperty(value = "联系人手机号码") - @PhoneNumber - @NotBlank(message = "联系人手机号码不能为空") +// @PhoneNumber +// @NotBlank(message = "联系人手机号码不能为空") private String contactPhone; /** diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveMonthImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveMonthImportVo.java index 3e55e6d..636e5f3 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveMonthImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveMonthImportVo.java @@ -48,11 +48,8 @@ public class OriginalMobileBankInactiveMonthImportVo implements Serializable { * 机构名称 */ @ExcelProperty(value = { - "", - "", - "", "机构名称" - }, index = 1) + }) @NotBlank(message = "机构名称不能为空") private String branchName; @@ -82,8 +79,8 @@ public class OriginalMobileBankInactiveMonthImportVo implements Serializable { * 签约手机号 */ @ExcelProperty(value = "签约手机号") - @PhoneNumber - @NotBlank(message = "签约手机号不能为空") +// @PhoneNumber +// @NotBlank(message = "签约手机号不能为空") private String mobile; /** diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveYearImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveYearImportVo.java index 95bee87..d1cede1 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveYearImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/OriginalMobileBankInactiveYearImportVo.java @@ -48,11 +48,8 @@ public class OriginalMobileBankInactiveYearImportVo implements Serializable { * 机构名称 */ @ExcelProperty(value = { - "", - "", - "", "机构名称" - }, index = 0) + }) @NotBlank(message = "机构名称不能为空") private String branchName; @@ -82,8 +79,8 @@ public class OriginalMobileBankInactiveYearImportVo implements Serializable { * 签约手机号 */ @ExcelProperty(value = "签约手机号") - @PhoneNumber - @NotBlank(message = "签约手机号不能为空") +// @PhoneNumber +// @NotBlank(message = "签约手机号不能为空") private String mobile; /**