From a582f5cd87d2ee36b79b9b3ab6de1a7690d3c1cf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 24 九月 2024 13:26:14 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/MatV2.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/MatV2.java b/src/main/java/com/zy/asrs/entity/MatV2.java
index 6738416..a2f4dd7 100644
--- a/src/main/java/com/zy/asrs/entity/MatV2.java
+++ b/src/main/java/com/zy/asrs/entity/MatV2.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableField;
@@ -35,18 +36,22 @@
     private String tagId;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "鍟嗗搧缂栫爜")
     private String matnr;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "鍟嗗搧鍚嶇О")
     private String maktx;
 
     @ApiModelProperty(value= "")
     private String name;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "瑙勬牸")
     private String specs;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "鍨嬪彿")
     private String model;
 
     @ApiModelProperty(value= "")
@@ -56,6 +61,7 @@
     private String brand;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "鍗曚綅")
     private String unit;
 
     @ApiModelProperty(value= "")
@@ -89,6 +95,7 @@
     private Double safeQty;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "閲嶉噺")
     private Double weight;
 
     @ApiModelProperty(value= "")
@@ -110,7 +117,8 @@
 
     @ApiModelProperty(value= "")
     @TableField("be_batch")
-    private Integer beBatch;
+    @ExcelProperty(value = "缁勬垚鐢ㄩ噺")
+    private Float beBatch;
 
     @ApiModelProperty(value= "")
     @TableField("dead_time")
@@ -151,11 +159,12 @@
     private Date updateTime;
 
     @ApiModelProperty(value= "")
+    @ExcelProperty(value = "澶囨敞")
     private String memo;
 
     public MatV2() {}
 
-    public MatV2(String uuid,String tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public MatV2(String uuid,String tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Float beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.uuid = uuid;
         this.tagId = tagId;
         this.matnr = matnr;

--
Gitblit v1.9.1