Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

9 天以前 2d03ec79e1892248b520cf097e8a58dd82a4892f

 src/main/java/com/ruoyi/production/dto/ProcessContentDto.java

@@ -1,10 +1,12 @@
package com.ruoyi.production.dto;

import com.ruoyi.dto.SimplePersonDto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.List;

/**
 * 工序加工内容Dto
@@ -18,8 +20,14 @@
public class ProcessContentDto implements Serializable {
    private String id;
    private Long processId;             // 工序id
    private String processContent;    // 工艺加工内容
    private String processName;    // 工艺加工内容
    private String openCount;         // 开数
    private String processPositive;   // 工艺正数
    private String allowanceQty;      // 加放数

    // 机台信息
    private Long deviceId;
    private String deviceName;

    List<SimplePersonDto> reportWorkerList;
}