From 22594e714c57c9e243fe9973515ea9467d71c2db Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 07 十一月 2023 18:35:11 +0800
Subject: [PATCH] Changes11

---
 mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java |   30 +++++++++---------------------
 1 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java
index 5677589..478892e 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java
@@ -8,38 +8,26 @@
  */
 @Data
 public class LocationData {
-	/**
-	 * 搴撲綅缂栧彿
-	 */
+
+	@ExcelProperty("宸ュ巶")
+	private String factoryName;
+
 	@ExcelProperty("搴撲綅缂栧彿")
 	private String locNo;
-	/**
-	 * 搴撲綅鍚嶇О
-	 */
+
 	@ExcelProperty("搴撲綅鍚嶇О")
 	private String locName;
 
 	@ExcelProperty("搴撲綅绫诲瀷锛堢嚎杈逛粨锛涗骇鍑哄悎鏍煎簱浣嶏紱浜у嚭寰呮搴撲綅锛涗笉鍚堟牸搴撲綅锛涘緟澶勭悊搴撲綅锛涙満鍙板簱锛�")
 	private String locType;
-	/**
-	 * 浠撳簱鍚嶇О
-	 */
+
 	@ExcelProperty("鎵�灞炰粨搴�")
 	private String warehouseName;
-
-	@ExcelProperty("浠撳簱鐘舵��")
-	private String locState;
-
-	private Long factoryId;
-
-	/**
-	 * 浠撳簱鍚嶇О
-	 */
-	@ExcelProperty("宸ュ巶")
-	private String factoryName;
 
 	@ExcelProperty("IFS搴撲綅")
 	private String ifsLocation;
 
-	private Long warehouseId;
+	@ExcelProperty("浠撳簱鐘舵��")
+	private String locState;
+
 }

--
Gitblit v1.9.3