Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-20 34181dcf0e38d744b8af1917bb5b8b0180b9eae1

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

@@ -33,6 +33,12 @@
    @Schema(description = "备注")
    private String remark;

    @Schema(description = "补料原因")
    private String feedingReason;

    @Schema(description = "本次补料数量")
    private BigDecimal feedingQuantity;

    @Schema(description = "领料明细列表")
    @JsonAlias({"dto", "productionOrderPickDto"})
    private List<ProductionOrderPickDto> pickList;