From 540d34e41ad66efc99f747f65f0d288cf03f4fe1 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 03 十一月 2023 09:10:41 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/excel/LocationData.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 d5acd62..5677589 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
@@ -1,8 +1,6 @@
package com.chinaztt.mes.basic.excel;
import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.Unique;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -20,21 +18,28 @@
*/
@ExcelProperty("搴撲綅鍚嶇О")
private String locName;
+
+ @ExcelProperty("搴撲綅绫诲瀷锛堢嚎杈逛粨锛涗骇鍑哄悎鏍煎簱浣嶏紱浜у嚭寰呮搴撲綅锛涗笉鍚堟牸搴撲綅锛涘緟澶勭悊搴撲綅锛涙満鍙板簱锛�")
+ private String locType;
/**
* 浠撳簱鍚嶇О
*/
- @ExcelProperty("浠撳簱鍚嶇О")
+ @ExcelProperty("鎵�灞炰粨搴�")
private String warehouseName;
- /**
- * 浠撳簱鍚嶇О
- */
- @ExcelProperty("宸ュ巶id")
+
+ @ExcelProperty("浠撳簱鐘舵��")
+ private String locState;
+
private Long factoryId;
+
/**
* 浠撳簱鍚嶇О
*/
- @ExcelProperty("宸ュ巶鍒嗙粍")
- private Long locGroup;
+ @ExcelProperty("宸ュ巶")
+ private String factoryName;
+ @ExcelProperty("IFS搴撲綅")
+ private String ifsLocation;
+ private Long warehouseId;
}
--
Gitblit v1.9.3