diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java index 7fce30ab6..8740062a6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java @@ -22,9 +22,11 @@ public class ProductDelaySaveReqVO { private Long purchaseId; @Schema(description = "延期时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "延期时长不能为空") private Integer delayDuration; @Schema(description = "延期时长单位,0:年、1:月、2:日", example = "1") + @NotNull(message = "延期时长单位不能为空") @DurationUnitValid private Integer delayDurationUnit; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java index 175f8f91a..c71991b07 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java @@ -9,6 +9,7 @@ import com.cf.imes.framework.excel.core.convert.EnumConvert; import com.cf.imes.module.system.enums.DictTypeConstants; import com.cf.imes.module.system.enums.pay.InvoiceStatusEnum; import com.cf.imes.module.system.enums.pay.ProductDurationUnitEnum; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -16,6 +17,8 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + @Data public class PurchaseRecordRespVO { @@ -105,6 +108,7 @@ public class PurchaseRecordRespVO { @Schema(description = "失效时间") @ExcelProperty("失效时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDate endTime; @Schema(description = "操作人")