From 3e19054b66343df9138362f51bc7ca0f18ffbd68 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 24 Jun 2024 19:12:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/eCallEventTwo/entity/EcOrder.java |    9 +--------
 1 files changed, 1 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..f02f54e 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;
 
 	/**

--
Gitblit v1.9.3