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

liyong

2026-05-11 8f50f1998f94c455bdae946fead91aad3ea09b02

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

@@ -45,10 +45,8 @@
    @Schema(description = "是否已退料")
    private Boolean returned;

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

    @Schema(description = "车间名称")
    @Excel(name = "车间名称",sort = 11)
    private String workshopName;