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/ECallEventTwoEntity.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/entity/ECallEventTwoEntity.java b/src/main/java/org/springblade/modules/eCallEventTwo/entity/ECallEventTwoEntity.java
index d322a2f..c3d5276 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/entity/ECallEventTwoEntity.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/entity/ECallEventTwoEntity.java
@@ -40,9 +40,16 @@
public class ECallEventTwoEntity {
private static final long serialVersionUID = 1L;
- /** 工单ID */
+ /**
+ * 工单ID
+ */
@ApiModelProperty(value = "主键ID", example = "")
- @TableId(value = "order_id", type = IdType.ASSIGN_ID)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ /** 工单ID */
+ @ApiModelProperty(value = "orderId", example = "")
+ @TableField(value = "order_id")
private Long orderId;
/** 工单号/话务单号 */
@@ -277,4 +284,17 @@
@TableField(value = "update_time",fill = FieldFill.UPDATE)
private Date updateTime;
+ /**
+ * 网格编号
+ */
+ @ApiModelProperty(value = "网格编号")
+ @TableField("grid_code")
+ private String gridCode;
+ /**
+ * 警务网格编号
+ */
+ @ApiModelProperty(value = "警务网格编号")
+ @TableField("jw_grid_code")
+ private String jwGridCode;
+
}
--
Gitblit v1.9.3