From ed7804d6625640253b88084ddd49cc3350f8a349 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 05 七月 2024 20:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 83f7b0f..4612333 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -3,6 +3,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.zy.asrs.common.wms.service.TagService;
 import org.springframework.format.annotation.DateTimeFormat;
 

--
Gitblit v1.9.1