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

buhuazhen

4 天以前 9a5d984a74d5f893fc51366b42391d9b4f8a83ed

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

@@ -13,8 +13,8 @@

    private static final long serialVersionUID = 1L;

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

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