From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/meterMachineFactory/MeterMachineFactoryDto.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/meterMachineFactory/MeterMachineFactoryDto.java b/java110-bean/src/main/java/com/java110/dto/meterMachineFactory/MeterMachineFactoryDto.java
index b6e1464..b1e6b33 100644
--- a/java110-bean/src/main/java/com/java110/dto/meterMachineFactory/MeterMachineFactoryDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/meterMachineFactory/MeterMachineFactoryDto.java
@@ -1,8 +1,11 @@
package com.java110.dto.meterMachineFactory;
import com.java110.dto.PageDto;
+import com.java110.dto.meterMachineFactorySpec.MeterMachineFactorySpecDto;
+
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @ClassName FloorDto
@@ -15,9 +18,11 @@
public class MeterMachineFactoryDto extends PageDto implements Serializable {
private String factoryId;
-private String factoryName;
-private String remark;
-private String beanImpl;
+ private String factoryName;
+ private String remark;
+ private String beanImpl;
+
+ private List<MeterMachineFactorySpecDto> specs;
private Date createTime;
@@ -28,25 +33,32 @@
public String getFactoryId() {
return factoryId;
}
-public void setFactoryId(String factoryId) {
+
+ public void setFactoryId(String factoryId) {
this.factoryId = factoryId;
}
-public String getFactoryName() {
+
+ public String getFactoryName() {
return factoryName;
}
-public void setFactoryName(String factoryName) {
+
+ public void setFactoryName(String factoryName) {
this.factoryName = factoryName;
}
-public String getRemark() {
+
+ public String getRemark() {
return remark;
}
-public void setRemark(String remark) {
+
+ public void setRemark(String remark) {
this.remark = remark;
}
-public String getBeanImpl() {
+
+ public String getBeanImpl() {
return beanImpl;
}
-public void setBeanImpl(String beanImpl) {
+
+ public void setBeanImpl(String beanImpl) {
this.beanImpl = beanImpl;
}
@@ -66,4 +78,12 @@
public void setStatusCd(String statusCd) {
this.statusCd = statusCd;
}
+
+ public List<MeterMachineFactorySpecDto> getSpecs() {
+ return specs;
+ }
+
+ public void setSpecs(List<MeterMachineFactorySpecDto> specs) {
+ this.specs = specs;
+ }
}
--
Gitblit v1.8.0