Merge branch 'refs/heads/dev_New' into dev_New_pro

liyong

2026-04-20 5bc029a31c4325d39f77fb6cb613a5e31df7ece3

 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;
}