From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc

---
 src/main/java/org/springblade/modules/location/entity/LiveLocation.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/location/entity/LiveLocation.java b/src/main/java/org/springblade/modules/location/entity/LiveLocation.java
index ee3c1f5..659abc1 100644
--- a/src/main/java/org/springblade/modules/location/entity/LiveLocation.java
+++ b/src/main/java/org/springblade/modules/location/entity/LiveLocation.java
@@ -38,7 +38,7 @@
 	 * 押运人员/车辆/枪支id
 	 */
 	@TableField("worker_id")
-	private Long workerId;
+	private String workerId;
 
 
 	/**

--
Gitblit v1.9.3