From 16cd5600efc6f94ed617cb09e1a2dd579017ddef Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 05 九月 2023 16:02:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
index 81c179c..01bcd45 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderListModelVO.java
@@ -63,7 +63,7 @@
@ApiModelProperty(value = "鎶曟枡鍒楄〃")
private List<MaterialModelVo> materialList;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
private Integer status;
@ApiModelProperty(value = "浼樺厛绾э紙鎺掑簭鐮侊級瀛楁", example = "1")
@@ -77,4 +77,10 @@
@ApiModelProperty(value = "鐢熶骇浜哄憳鍒嗛厤闆嗗悎" )
private List<WorkorderUserExtListVO> proUserList;
+
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private Integer createUser;
+
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ private String createUserName;
}
--
Gitblit v1.9.3