From 1717a12c83db01e3b31ea9ed913e5bacaf9edbf3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 29 三月 2025 14:24:06 +0800
Subject: [PATCH] 修改

---
 billion-main/src/main/java/com/billion/main/da/domain/DaMaterialCollection.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 62a1d9a..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
@@ -1,12 +1,13 @@
 package com.billion.main.da.domain;
 
 import java.util.Date;
+
+import com.billion.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.billion.common.annotation.Excel;
-import com.billion.main.common.BaseEntity;
 
 /**
  * 鐗╂枡閲囬泦瀵硅薄 da_material_collection
@@ -42,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