diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java index ae6b3e839..7ce6b67a7 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/ReconciliationDTO.java @@ -212,11 +212,11 @@ public class ReconciliationDTO extends BaseVOEntity{ @ApiModelProperty("创建时间开始") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd") - private Date createTimeStart; + private String createTimeStart; @ApiModelProperty("创建时间结束") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd") - private Date createTimeEnd; + private String createTimeEnd; @ApiModelProperty("审核时间开始") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd") diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java index f32007dc3..28e9bb95e 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/todo/ReconciliationDO.java @@ -225,11 +225,11 @@ public class ReconciliationDO extends BaseVOEntity{ @ApiModelProperty("创建时间开始") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间开始", width = 30, dateFormat = "yyyy-MM-dd") - private Date createTimeStart; + private String createTimeStart; @ApiModelProperty("创建时间结束") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "创建时间结束", width = 30, dateFormat = "yyyy-MM-dd") - private Date createTimeEnd; + private String createTimeEnd; @ApiModelProperty("审核时间开始") @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "审核时间开始", width = 30, dateFormat = "yyyy-MM-dd")