diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java index 35857e2b9..4033134d2 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/entity/Lease.java @@ -10,6 +10,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalTime; import java.util.Date; /** @@ -80,9 +81,9 @@ public class Lease extends BaseVOEntity{ private Integer billDays; @ApiModelProperty("出账时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date billTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss") + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime billTime; @ApiModelProperty("业务员") private String salesmanName; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java index 378a87f08..42f7e3419 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/po/LeasePO.java @@ -8,6 +8,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalTime; import java.util.Date; /** @@ -81,9 +82,9 @@ public class LeasePO extends BaseVOEntity{ private Integer billDays; @ApiModelProperty("出账时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date billTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss") + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime billTime; @ApiModelProperty("业务员") private String salesmanName; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java index 56af6a806..a04eac36f 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/lease/repository/todo/LeaseDO.java @@ -10,6 +10,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalTime; import java.util.Date; /** @@ -85,9 +86,9 @@ public class LeaseDO extends BaseVOEntity{ private Integer billDays; @ApiModelProperty("出账时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date billTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss") + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime billTime; @ApiModelProperty("业务员") private String salesmanName; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java index a8966222d..323d7ef55 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/lease/LeaseDTO.java @@ -8,6 +8,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.time.LocalTime; import java.util.Date; import java.util.List; @@ -82,9 +83,9 @@ public class LeaseDTO extends BaseVOEntity{ private Integer billDays; @ApiModelProperty("出账时间") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - private Date billTime; + @JsonFormat(timezone = "GMT+8", pattern = "HH:mm:ss") + @DateTimeFormat(pattern = "HH:mm:ss") + private LocalTime billTime; @ApiModelProperty("业务员") private String salesmanName;