From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001 From: linwe <872216996@qq.com> Date: Tue, 03 Sep 2024 09:46:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog --- src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java b/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java index af0dc7d..496325d 100644 --- a/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java +++ b/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java @@ -15,19 +15,28 @@ @ApiModelProperty(value = "开始时间", example = "") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime startTime; + private String startTime; @ApiModelProperty(value = "结束时间", example = "") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime endTime; + private String endTime; @ApiModelProperty(value = "调度单位", example = "") - private String objectOrgCode; + private String subjectOrgCode; + + @ApiModelProperty(value = "调度单位名称", example = "") + private String subjectOrgName; @ApiModelProperty(value = "主办单位", example = "") private String sinkOrgCode; + @ApiModelProperty(value = "主办单位名称", example = "") + private String sinkOrgName; + @ApiModelProperty(value = "是否主办（Y/N）", example = "") private String tagMain; + + @ApiModelProperty(value = "是否主办（1/2）", example = "") + private Integer mainFlag; } -- Gitblit v1.9.3