Merge branch 'test' into 'planz'

Test

See merge request infra/xlog!46
This commit is contained in:
彭健 2022-10-19 10:11:57 +00:00
commit 4f93eb50c2
2 changed files with 1 additions and 4 deletions

View File

@ -18,7 +18,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
* @description: TODO
* @date: 2022/9/16
*/
@FeignClient(name = "log-plat", url = "http://axzo-log-plat:8080", fallbackFactory = LogPlatApiFallback.class)
@FeignClient(name = "log-plat", url = "http://log-plat:8080", fallbackFactory = LogPlatApiFallback.class)
public interface LogPlatApi {
@PostMapping(value = "/api/v1/operateLog/create", consumes = APPLICATION_JSON_VALUE)

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;
/**