Merge branch 'dev' into 'test'

Dev

See merge request infra/xlog!42
This commit is contained in:
彭健 2022-10-19 02:14:43 +00:00
commit 3da596035c

View File

@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@ -48,7 +47,6 @@ public class OperateLogQueryReqDTO extends PageRequest {
*/
@ApiModelProperty(value = "操作开始时间", position = 5, required = true, example = "2022-10-10 12:12:12")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@NotNull
private Date startTime;
/**
@ -56,7 +54,6 @@ public class OperateLogQueryReqDTO extends PageRequest {
*/
@ApiModelProperty(value = "操作结束时间", position = 6, required = true, example = "2022-10-10 12:12:12")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@NotNull
private Date endTime;
/**