From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java b/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
index 1277da9..1b3be6a 100644
--- a/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
+++ b/server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java
@@ -1,5 +1,7 @@
package doumeemes.dao.business.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,8 +17,15 @@
public class AutoWorkReportDTO {
- @ApiModelProperty(value = "宸ュ簭璁″垝涓婚敭")
+ @ApiModelProperty(value = "宸ュ簭璁″垝涓婚敭锛堜竴閿姤宸ワ級")
private Integer plansId;
+
+ @ApiModelProperty(value = "璁惧涓婚敭", example = "1")
+ private Integer proGroupId;
+
+ @ApiModelProperty(value = "鐢熶骇浜哄憳缂栫爜闆嗗悎" )
+ @TableField(exist = false)
+ private List<Integer> proUserList;
@ApiModelProperty(value = "鎶曟枡璁板綍")
private List<MaterialListDTO> recordList ;
@@ -24,4 +33,7 @@
@ApiModelProperty(value = "浜у嚭璁板綍")
private CreateWorkorderRecordDTO createWorkorderRecordDTO;
+ @ApiModelProperty(value = "涓嶈壇鍝佸垎绫昏褰�")
+ private List<CreateUnqualifiedDTO> createUnqualifiedDTOList ;
+
}
--
Gitblit v1.9.3