From d61ada7b575417f00438ca2df140870249fca721 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 25 三月 2025 19:25:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java
index 3162ea3..0c64ce7 100644
--- a/billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java
+++ b/billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java
@@ -43,6 +43,14 @@
@Excel(name = "鍙傛暟鍊�")
private String paramValue;
+ /** 鐗╂枡缂栫爜 */
+ @Excel(name = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ /** 鐗╂枡鍚嶇О */
+ @Excel(name = "鐗╂枡鍚嶇О")
+ private String materialName;
+
/** 閲囬泦鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3