diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index 77138f9..3e32bb6 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -3,8 +3,8 @@ spring: import: # - classpath:nacos.yml # - classpath:sdk.yml - - classpath:nacos-prod.yml - - classpath:sdk-prod.yml # - classpath:nacos-prod.yml -# - classpath:sdk-prod2.yml +# - classpath:sdk-prod.yml + - classpath:nacos-prod.yml + - classpath:sdk-prod2.yml - classpath:swagger.yml diff --git a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserAddCmd.java b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserAddCmd.java index db05109..151d44c 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserAddCmd.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserAddCmd.java @@ -1,6 +1,7 @@ package com.zcloud.edu.dto.training; import com.alibaba.cola.dto.Command; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; @@ -29,10 +30,12 @@ public class TrainingUserAddCmd extends Command { @ApiModelProperty(value = "有效期开始时间", name = "startTime", required = true) @NotNull(message = "有效期开始时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; @ApiModelProperty(value = "有效期结束时间", name = "endTime", required = true) @NotNull(message = "有效期结束时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; @ApiModelProperty(value = "考试状态:1.待考试2:考试通过,3:考试不通过", name = "examineStatus", required = true)