Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java

@@ -349,4 +349,7 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "生产状态")
    private String productionStatus = "未开始";

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}