From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java b/java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java
index e399e0c..ce70cab 100755
--- a/java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java
@@ -94,6 +94,8 @@
private String remark;
+ private String isNow;
+
private Date createTime;
@@ -255,4 +257,12 @@
public void setMachineName(String machineName) {
this.machineName = machineName;
}
+
+ public String getIsNow() {
+ return isNow;
+ }
+
+ public void setIsNow(String isNow) {
+ this.isNow = isNow;
+ }
}
--
Gitblit v1.8.0