Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

buhuazhen

2026-05-09 7496e718f10286651b9e2d08a8b8548cd3b242b6

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

@@ -39,4 +39,12 @@

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

    @Schema(description = "车间id")
    private Long workshopId;

    @Schema(description = "车间名称")
    private String workshopName;


}