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

liyong

2 天以前 d0a20f29f07dc24c1fc0b27b8572b24a083d8c0d

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

@@ -40,4 +40,9 @@

    @ApiModelProperty(value = "报废数量")
    private BigDecimal scrapQty;

    @ApiModelProperty(value = "工单类型 正常 /返工返修")
    private String workOrderType;

    private String deviceName;
}