diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/MarketingPerformance.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/MarketingPerformance.java index bafb416..f834990 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/MarketingPerformance.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/MarketingPerformance.java @@ -420,7 +420,7 @@ public class MarketingPerformance extends TenantEntity { /** * 记录日期 */ - private Date recordDate; + private String recordDate; /** * 报表类型 d:日报 m:月报 q:季报 y:年报 diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/bo/MarketingPerformanceBo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/bo/MarketingPerformanceBo.java index b03911f..369d193 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/bo/MarketingPerformanceBo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/bo/MarketingPerformanceBo.java @@ -494,7 +494,7 @@ public class MarketingPerformanceBo extends BaseEntity { * 记录日期 */ @NotNull(message = "记录日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private Date recordDate; + private String recordDate; /** * 报表类型 d:日报 m:月报 q:季报 y:年报 diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceImportVo.java index 4b83f10..6555ba3 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceImportVo.java @@ -508,7 +508,7 @@ public class MarketingPerformanceImportVo implements Serializable { * 记录日期 */ @ExcelProperty(value = "记录日期") - private Date recordDate; + private String recordDate; /** * 报表类型 d:日报 m:月报 q:季报 y:年报 diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceVo.java index 8e78da5..1ef1b6f 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingPerformanceVo.java @@ -580,7 +580,7 @@ public class MarketingPerformanceVo implements Serializable { * 记录日期 */ @ExcelProperty(value = "记录日期", converter = ExcelDateConvert.class, index = 54) - private Date recordDate; + private String recordDate; // /** // * 报表类型 d:日报 m:月报 q:季报 y:年报