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

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

 src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java

@@ -71,4 +71,10 @@

    @Schema(description = "工序参数列表")
    private List<ProductionOrderRoutingOperationParam> productionOperationParamList;

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

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