From 9c21d0b197cee42ab475570f82eba18cd9307e70 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 15 一月 2024 18:27:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes
---
jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
index 3e418c0..959c22c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/sc/stationConf/domain/ScStationConf.java
@@ -58,6 +58,8 @@
@Excel(name = "鏇存敼鐢ㄦ埛")
private String updateUser;
+ @Excel(name = "缃戝崱鍦板潃")
+ private String macAddress;
/** 澶囨敞 */
@Excel(name = "澶囨敞")
private String remarks;
@@ -76,9 +78,15 @@
this.processesCode = processesCode;
}
- public String getProcessesCode()
+ public String getProcessesCode()
{
return processesCode;
+ }
+ public void setMacAddress(String macAdress) {this.macAddress = macAdress;}
+
+ public String getMacAddress()
+ {
+ return macAddress;
}
public void setProcessesName(String processesName)
{
@@ -176,6 +184,7 @@
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("processesCode", getProcessesCode())
+ .append("macAddress", getMacAddress())
.append("processesName", getProcessesName())
.append("processesType", getProcessesType())
.append("ipAddress", getIpAddress())
--
Gitblit v1.9.3