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/entity/EcOrder.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java b/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java
index f595cc4..76a51cd 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java
@@ -30,14 +30,7 @@
* 工单ID
*/
@ApiModelProperty(value = "主键ID", example = "")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 工单ID
- */
- @ApiModelProperty(value = "订单id", example = "")
- @TableId(value = "order_id")
+ @TableId(value = "order_id", type = IdType.AUTO)
private Long orderId;
/**
@@ -391,4 +384,9 @@
@ApiModelProperty(value = "核实/督办（N1/N2）", example = "")
@TableField("tag_redo")
private String tagRedo;
+
+ @ApiModelProperty(value = "导入时间", example = "")
+ @TableField("import_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date importTime;
}
--
Gitblit v1.9.3