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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

@@ -18,8 +18,8 @@
    @ApiModelProperty(value = "月份(一月, 二月...)")
    private String month;

    @ApiModelProperty(value = "类别(0:原材料检验;1:过程检验;2:出厂检验)")
    private Integer inspectType;
    @ApiModelProperty(value = "类别(0:原材料;1:半成品;2:成品)")
    private Integer modelType;

    @ApiModelProperty(value = "总数量")
    private BigDecimal totalCount;