From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
index 780686d..70acbed 100644
--- a/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
+++ b/src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -34,10 +34,10 @@
 	private String name;
 
 	/**
-	* 保安公司 tenant_id
+	* 部门id
 	*/
-	@TableField("tenant_id")
-	private String tenantId;
+	@TableField("dept_id")
+	private Long deptId;
 
 	/**
 	 * 联系人
@@ -77,5 +77,10 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
+	/**
+	 * 行政区id
+	 */
+	private Long jurisdiction;
+
 
 }

--
Gitblit v1.9.3