diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java index 9673750..c0d468e 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/service/impl/MpsMarketServiceImpl.java @@ -358,7 +358,7 @@ public class MpsMarketServiceImpl implements IMpsMarketService { lqw1.ne(mpsTraffic.getId() != null, MpsTraffic::getId, mpsTraffic.getId()); List result1 = TrafficMapper.selectVoList(lqw1); if (!result1.isEmpty()) { - throw new ServiceException("该代缴交警罚没款已存在,编号:"+mpsTraffic.getTrafficNo()); + throw new ServiceException("该代缴交警罚没款已存在,编号:"+mpsTraffic.getTrafficNo()); } } //id diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/MpsImportNormalMerchant.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/MpsImportNormalMerchant.java index b2985f0..5b011ef 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/MpsImportNormalMerchant.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/MpsImportNormalMerchant.java @@ -70,6 +70,11 @@ public class MpsImportNormalMerchant extends TenantEntity { */ private String parentMerchantId; + /** + * 创建时间 + */ + private Date createDate; + /** * 来源 */ diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/bo/MpsImportNormalMerchantBo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/bo/MpsImportNormalMerchantBo.java index 43e16b0..b3d1727 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/bo/MpsImportNormalMerchantBo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/bo/MpsImportNormalMerchantBo.java @@ -68,6 +68,11 @@ public class MpsImportNormalMerchantBo extends BaseEntity { */ private String parentMerchantId; + /** + * 创建时间 + */ + private Date createDate; + /** * 来源 */ @@ -114,7 +119,7 @@ public class MpsImportNormalMerchantBo extends BaseEntity { private String businessScope; /** - * 经营范围(二级) + * 经营范围二级 */ private String businessScopeSecondary; diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantImportVo.java index 711c667..e63f601 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantImportVo.java @@ -95,6 +95,13 @@ public class MpsImportNormalMerchantImportVo implements Serializable { @ExcelProperty(value = "一级商户号") private String parentMerchantId; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createDate; + /** * 来源 */ @@ -152,8 +159,7 @@ public class MpsImportNormalMerchantImportVo implements Serializable { /** * 经营范围(二级) */ - @ExcelProperty(value = "经营范围", converter = ExcelDictConvert.class) -// @ExcelDictFormat(readConverterExp = "二=级") + @ExcelProperty(value = "经营范围二级") private String businessScopeSecondary; /** diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantVo.java index b0698d7..0003783 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/original/domain/vo/MpsImportNormalMerchantVo.java @@ -85,6 +85,12 @@ public class MpsImportNormalMerchantVo implements Serializable { @ExcelProperty(value = "一级商户号") private String parentMerchantId; + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createDate; + /** * 来源 */ @@ -142,8 +148,7 @@ public class MpsImportNormalMerchantVo implements Serializable { /** * 经营范围(二级) */ - @ExcelProperty(value = "经营范围", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "二=级") + @ExcelProperty(value = "经营范围二级") private String businessScopeSecondary; /**