Merge remote-tracking branch 'refs/remotes/origin/dev_New' into jtwy

liyong

2026-02-04 69bb4a6479653f2e27cb67ce0ab817bd40e9c791

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

@@ -40,4 +40,7 @@

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

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