From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java
index 827f2cf..2f34a0b 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Division.java
@@ -97,7 +97,6 @@
 	@ApiModelProperty(value = "鏇存柊鑰�")
 	private String updateUser;
 
-
 	@TableLogic
 	private Boolean active;
 
@@ -107,11 +106,9 @@
 	@TableField(exist = false)
 	private String companyName;
 
-	@TableField(exist = false)
-	private String factoryId;
+	private Long factoryId;
 	/**
 	 * 宸ュ巶鍚�
 	 */
-	@TableField(exist = false)
 	private String factoryName;
 }

--
Gitblit v1.9.3