From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailVo.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailVo.java
index 56019c0..1fc5a89 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderDetailVo.java
@@ -43,9 +43,21 @@
@ApiModelProperty(value = "服务单状态")
private String status;
+ @ApiModelProperty(value = "服务单评论")
+ private String comment;
+
+
@ApiModelProperty(value = "服务明细")
private List<ServiceOrderDetailItemVo> items;
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
public String getServiceNo() {
return serviceNo;
}
--
Gitblit v1.9.1