From d044dc871c16f05c9a1fb1489621020c91ec9d59 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 16 八月 2023 18:30:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes

---
 server/src/main/java/doumeemes/dao/business/dto/AutoWorkReportDTO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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..4026b98 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;
 
@@ -18,10 +20,20 @@
     @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 ;
 
     @ApiModelProperty(value = "浜у嚭璁板綍")
     private CreateWorkorderRecordDTO createWorkorderRecordDTO;
 
+    @ApiModelProperty(value = "涓嶈壇鍝佸垎绫昏褰�")
+    private List<CreateUnqualifiedDTO> createUnqualifiedDTOList ;
+
 }

--
Gitblit v1.9.3