From 2b0dc519ddc4fefcabc7f60dcda4968964155e11 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 17 十一月 2023 16:45:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java
index 78c5fe8..5e4ae7d 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/entity/Post.java
@@ -48,16 +48,31 @@
 	/**
 	 * 鍏徃
 	 */
-	private Long company;
+	private Long companyId;
 
 	/**
 	 * 宸ュ巶
 	 */
-	private Long factory;
+	private Long factoryId;
 
 
 	/**
 	 * 閮ㄩ棬
 	 */
-	private Long division;
+	private Long divisionId;
+
+	/**
+	 * 宸ュ巶鍚�
+	 */
+	private String factoryName;
+
+	/**
+	 * 閮ㄩ棬鍚�
+	 */
+	private String divisionName;
+
+	/**
+	 * 閮ㄩ棬鍚�
+	 */
+	private String companyName;
 }

--
Gitblit v1.9.3