From 3219ee5eb2c7de1e1401bd94cb4dc4d37195b244 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 四月 2022 11:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 56 insertions(+), 1 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java
old mode 100644
new mode 100755
index 00905a0..d1ddf42
--- a/java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/machineTranslate/ApiMachineTranslateDataVo.java
@@ -1,12 +1,12 @@
package com.java110.vo.api.machineTranslate;
import java.io.Serializable;
-import java.util.Date;
public class ApiMachineTranslateDataVo implements Serializable {
private String machineTranslateId;
private String machineCode;
+ private String machineName;
private String machineId;
private String typeCd;
private String typeCdName;
@@ -15,6 +15,13 @@
private String state;
private String stateName;
private String createTime;
+ private String updateTime;
+
+ private String machineCmd;
+ private String machineCmdName;
+ private String remark;
+
+ private String objBId;
public String getMachineTranslateId() {
return machineTranslateId;
@@ -95,4 +102,52 @@
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getMachineCmd() {
+ return machineCmd;
+ }
+
+ public void setMachineCmd(String machineCmd) {
+ this.machineCmd = machineCmd;
+ }
+
+ public String getObjBId() {
+ return objBId;
+ }
+
+ public void setObjBId(String objBId) {
+ this.objBId = objBId;
+ }
+
+ public String getMachineCmdName() {
+ return machineCmdName;
+ }
+
+ public void setMachineCmdName(String machineCmdName) {
+ this.machineCmdName = machineCmdName;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getMachineName() {
+ return machineName;
+ }
+
+ public void setMachineName(String machineName) {
+ this.machineName = machineName;
+ }
}
--
Gitblit v1.8.0