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/excel/WarehouseData.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/WarehouseData.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/WarehouseData.java
index 9d70b73..88cfec5 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/WarehouseData.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/WarehouseData.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;
/**
@@ -26,7 +24,9 @@
@ExcelProperty("浠撳簱绫诲瀷")
private String type;
- @ExcelProperty("宸ュ巶鍚嶇О")
+ @ExcelProperty("宸ュ巶")
private String factoryName;
+ @ExcelProperty("浠撳簱鐘舵��")
+ private String state;
}
--
Gitblit v1.9.3