From 7f1dbf4296013a4b15fbc2748de072f7c7ad4388 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 一月 2024 16:42:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
index 015bb39..a7b9a52 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
@@ -22,6 +22,8 @@
@Excel(name = "鐗╂枡缂栧彿")
private String materialCode;
+ @Excel(name = "杞﹀瀷")
+ private String carType;
/** 鐗╂枡鍚嶇О */
@Excel(name = "鐗╂枡鍚嶇О")
private String materialName;
@@ -97,6 +99,12 @@
public String getMaterialCode()
{
return materialCode;
+ }
+ public void setCarType(String carType) {this.carType = carType;}
+
+ public String getCarType()
+ {
+ return carType;
}
public void setMaterialName(String materialName)
{
@@ -241,6 +249,7 @@
.append("id", getId())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
+ .append("carType", getCarType())
.append("materialView", getMaterialView())
.append("typeZ", getTypeZ())
.append("typeL", getTypeL())
--
Gitblit v1.9.3