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

buhuazhen

2026-05-09 7496e718f10286651b9e2d08a8b8548cd3b242b6

 src/main/java/com/ruoyi/production/pojo/ProductionOrder.java

@@ -80,4 +80,9 @@
    @Schema(description = "是否结束）")
    @TableField("is_end_order")
    private Boolean endOrder;


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