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 |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 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 7ca0182..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
@@ -6,6 +6,7 @@
 
     private String machineTranslateId;
     private String machineCode;
+    private String machineName;
     private String machineId;
     private String typeCd;
     private String typeCdName;
@@ -17,6 +18,8 @@
     private String updateTime;
 
     private String machineCmd;
+    private String machineCmdName;
+    private String remark;
 
     private String objBId;
 
@@ -123,4 +126,28 @@
     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