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

zss

8 天以前 5ad54547dc97b76dc3d689b9499dec7364968235

 src/main/java/com/ruoyi/production/bean/vo/ProductionOrderVo.java

@@ -36,4 +36,7 @@

    @Schema(description = "完成进度")
    private BigDecimal completionStatus;

    @Schema(description = "是否已退料")
    private Boolean returned;
}