From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 17 三月 2025 15:57:31 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after --- cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java index 686596c..23279bc 100644 --- a/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java +++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/excel/FeStandardSubstanceExcel.java @@ -1,5 +1,6 @@ package com.yuanchu.mom.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.yuanchu.mom.pojo.FeStandardSubstance; import lombok.Data; @@ -41,15 +42,16 @@ @ExcelProperty("瀛樻斁浣嶇疆") private String position; - @ExcelProperty("鍊熻皟鐘舵��") + @ExcelIgnore private Integer state; + + @ExcelProperty("鍊熻皟鐘舵��") + private String stateName; @ExcelProperty("澶囨敞") private String remark; - @ExcelProperty("鍒涘缓浜�") - private String createUser; - @ExcelProperty("鍒涘缓鏃ユ湡") private LocalDateTime createTime; + } -- Gitblit v1.9.3