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/DivisionData.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/DivisionData.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/DivisionData.java
index 047b9fc..bdf20d2 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/DivisionData.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/excel/DivisionData.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;
/**
@@ -25,4 +23,8 @@
*/
@ExcelProperty("鍏徃鍚嶇О")
private String companyName;
+
+ @ExcelProperty("宸ュ巶鍚嶇О")
+ private String factoryName;
+
}
--
Gitblit v1.9.3