Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

3 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 src/main/java/com/ruoyi/quality/dto/QualityMonthlyPassRateWrapperDto.java

@@ -1,7 +1,6 @@
package com.ruoyi.quality.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.io.Serializable;
@@ -10,19 +9,19 @@
 * 质量月度合格率包装DTO（按月分组）
 */
@Data
@ApiModel(value = "QualityMonthlyPassRateWrapperDto", description = "质量月度合格率包装DTO（按月分组）")
@Schema(name = "QualityMonthlyPassRateWrapperDto", description = "质量月度合格率包装DTO（按月分组）")
public class QualityMonthlyPassRateWrapperDto implements Serializable {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "月份")
    @Schema(description = "月份")
    private String month;

    @ApiModelProperty(value = "原材料")
    @Schema(description = "原材料")
    private QualityPassRateDto rawMaterial;

    @ApiModelProperty(value = "半成品")
    @Schema(description = "半成品")
    private QualityPassRateDto process;

    @ApiModelProperty(value = "成品")
    @Schema(description = "成品")
    private QualityPassRateDto outgoing;
}