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/po/machine/MachineRecordPo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/po/machine/MachineRecordPo.java b/java110-bean/src/main/java/com/java110/po/machine/MachineRecordPo.java
index 9c9ed9f..7dae085 100755
--- a/java110-bean/src/main/java/com/java110/po/machine/MachineRecordPo.java
+++ b/java110-bean/src/main/java/com/java110/po/machine/MachineRecordPo.java
@@ -28,6 +28,7 @@
private String resOrderType;
private String noticeState;
private String auditMessage;
+ private String similar;
public String getMachineRecordId() {
return machineRecordId;
@@ -156,4 +157,12 @@
public void setAuditMessage(String auditMessage) {
this.auditMessage = auditMessage;
}
+
+ public String getSimilar() {
+ return similar;
+ }
+
+ public void setSimilar(String similar) {
+ this.similar = similar;
+ }
}
--
Gitblit v1.8.0