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

gongchunyi

23 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

@@ -17,12 +17,12 @@
    @ApiModelProperty(value = "月份")
    private String month;

    @ApiModelProperty(value = "原材料检验数据")
    @ApiModelProperty(value = "原材料")
    private QualityPassRateDto rawMaterial;

    @ApiModelProperty(value = "过程检验数据")
    @ApiModelProperty(value = "半成品")
    private QualityPassRateDto process;

    @ApiModelProperty(value = "出厂检验数据")
    @ApiModelProperty(value = "成品")
    private QualityPassRateDto outgoing;
}